5 files changed, 44 insertions, 14 deletions

diff --git a/net/mac802154/mac802154.h b/net/mac802154/mac802154.h
index 703c1210d223..d48422e27110 100644
--- a/net/mac802154/mac802154.h
+++ b/net/mac802154/mac802154.h
@@ -88,8 +88,6 @@ struct mac802154_sub_if_data {
 
 #define mac802154_to_priv(_hw)  container_of(_hw, struct mac802154_priv, hw)
 
-#define MAC802154_MAX_XMIT_ATTEMPTS     3
-
 #define MAC802154_CHAN_NONE             0xff /* No channel is assigned */
 
 extern struct ieee802154_reduced_mlme_ops mac802154_mlme_reduced;
@@ -114,5 +112,6 @@ void mac802154_dev_set_ieee_addr(struct net_device *dev);
 u16 mac802154_dev_get_pan_id(const struct net_device *dev);
 void mac802154_dev_set_pan_id(struct net_device *dev, u16 val);
 void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan);
+u8 mac802154_dev_get_dsn(const struct net_device *dev);
 
 #endif /* MAC802154_H */
diff --git a/net/mac802154/mac_cmd.c b/net/mac802154/mac_cmd.c
index d8d277006089..a99910d4d52f 100644
--- a/net/mac802154/mac_cmd.c
+++ b/net/mac802154/mac_cmd.c
@@ -73,4 +73,5 @@ struct ieee802154_mlme_ops mac802154_mlme_wpan = {
         .start_req = mac802154_mlme_start_req,
         .get_pan_id = mac802154_dev_get_pan_id,
         .get_short_addr = mac802154_dev_get_short_addr,
+        .get_dsn = mac802154_dev_get_dsn,
 };
diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index f47781ab0ccc..8ded97cf1c33 100644
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c
@@ -159,6 +159,15 @@ void mac802154_dev_set_pan_id(struct net_device *dev, u16 val)
         }
 }
 
+u8 mac802154_dev_get_dsn(const struct net_device *dev)
+{
+        struct mac802154_sub_if_data *priv = netdev_priv(dev);
+
+        BUG_ON(dev->type != ARPHRD_IEEE802154);
+
+        return priv->dsn++;
+}
+
 static void phy_chan_notify(struct work_struct *work)
 {
         struct phy_chan_notify_work *nw = container_of(work,
@@ -167,9 +176,15 @@ static void phy_chan_notify(struct work_struct *work)
         struct mac802154_sub_if_data *priv = netdev_priv(nw->dev);
         int res;
 
+        mutex_lock(&priv->hw->phy->pib_lock);
         res = hw->ops->set_channel(&hw->hw, priv->page, priv->chan);
         if (res)
                 pr_debug("set_channel failed\n");
+        else {
+                priv->hw->phy->current_channel = priv->chan;
+                priv->hw->phy->current_page = priv->page;
+        }
+        mutex_unlock(&priv->hw->phy->pib_lock);
 
         kfree(nw);
 }
@@ -186,8 +201,11 @@ void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan)
         priv->chan = chan;
         spin_unlock_bh(&priv->mib_lock);
 
+        mutex_lock(&priv->hw->phy->pib_lock);
         if (priv->hw->phy->current_channel != priv->chan ||
             priv->hw->phy->current_page != priv->page) {
+                mutex_unlock(&priv->hw->phy->pib_lock);
+
                 work = kzalloc(sizeof(*work), GFP_ATOMIC);
                 if (!work)
                         return;
@@ -195,5 +213,6 @@ void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan)
                 INIT_WORK(&work->work, phy_chan_notify);
                 work->dev = dev;
                 queue_work(priv->hw->dev_workqueue, &work->work);
-        }
+        } else
+                mutex_unlock(&priv->hw->phy->pib_lock);
 }
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index 4e09d070995a..6d1647399d4f 100644
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -25,6 +25,7 @@
 #include <linux/if_arp.h>
 #include <linux/crc-ccitt.h>
 
+#include <net/ieee802154_netdev.h>
 #include <net/mac802154.h>
 #include <net/wpan-phy.h>
 
@@ -39,12 +40,12 @@ struct xmit_work {
         struct mac802154_priv *priv;
         u8 chan;
         u8 page;
-        u8 xmit_attempts;
 };
 
 static void mac802154_xmit_worker(struct work_struct *work)
 {
         struct xmit_work *xw = container_of(work, struct xmit_work, work);
+        struct mac802154_sub_if_data *sdata;
         int res;
 
         mutex_lock(&xw->priv->phy->pib_lock);
@@ -57,21 +58,23 @@ static void mac802154_xmit_worker(struct work_struct *work)
                         pr_debug("set_channel failed\n");
                         goto out;
                 }
+
+                xw->priv->phy->current_channel = xw->chan;
+                xw->priv->phy->current_page = xw->page;
         }
 
         res = xw->priv->ops->xmit(&xw->priv->hw, xw->skb);
+        if (res)
+                pr_debug("transmission failed\n");
 
 out:
         mutex_unlock(&xw->priv->phy->pib_lock);
 
-        if (res) {
-                if (xw->xmit_attempts++ < MAC802154_MAX_XMIT_ATTEMPTS) {
-                        queue_work(xw->priv->dev_workqueue, &xw->work);
-                        return;
-                } else
-                        pr_debug("transmission failed for %d times",
-                                 MAC802154_MAX_XMIT_ATTEMPTS);
-        }
+        /* Restart the netif queue on each sub_if_data object. */
+        rcu_read_lock();
+        list_for_each_entry_rcu(sdata, &xw->priv->slaves, list)
+                netif_wake_queue(sdata->dev);
+        rcu_read_unlock();
 
         dev_kfree_skb(xw->skb);
 
@@ -82,6 +85,7 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb,
                          u8 page, u8 chan)
 {
         struct xmit_work *work;
+        struct mac802154_sub_if_data *sdata;
 
         if (!(priv->phy->channels_supported[page] & (1 << chan))) {
                 WARN_ON(1);
@@ -109,12 +113,17 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb,
                 return NETDEV_TX_BUSY;
         }
 
+        /* Stop the netif queue on each sub_if_data object. */
+        rcu_read_lock();
+        list_for_each_entry_rcu(sdata, &priv->slaves, list)
+                netif_stop_queue(sdata->dev);
+        rcu_read_unlock();
+
         INIT_WORK(&work->work, mac802154_xmit_worker);
         work->skb = skb;
         work->priv = priv;
         work->page = page;
         work->chan = chan;
-        work->xmit_attempts = 0;
 
         queue_work(priv->dev_workqueue, &work->work);
 
diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c
index d20c6d3c247d..2ca2f4dceab7 100644
--- 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;