Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / net / mac802154 / wpan.c

diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c
index d20c6d3c247db1b15036977e585e9e039829f3f9..2ca2f4dceab77167dea995132ef730b6981ead2f 100644 (file)
--- a/net/mac802154/wpan.c
+++ b/net/mac802154/wpan.c
@@ -145,6 +145,8 @@ static int mac802154_header_create(struct sk_buff *skb,
 
        head[pos++] = mac_cb(skb)->seq; /* DSN/BSN */
        fc = mac_cb_type(skb);
+       if (mac_cb_is_ackreq(skb))
+               fc |= IEEE802154_FC_ACK_REQ;
 
        if (!saddr) {
                spin_lock_bh(&priv->mib_lock);
@@ -358,7 +360,7 @@ void mac802154_wpan_setup(struct net_device *dev)
        dev->header_ops         = &mac802154_header_ops;
        dev->needed_tailroom    = 2; /* FCS */
        dev->mtu                = IEEE802154_MTU;
-       dev->tx_queue_len       = 10;
+       dev->tx_queue_len       = 300;
        dev->type               = ARPHRD_IEEE802154;
        dev->flags              = IFF_NOARP | IFF_BROADCAST;
        dev->watchdog_timeo     = 0;