mac802154: Keep track of the channel when changed

Two sections checked whether the current channel != the new channel
without ever setting the current channel variables.

1. net/mac802154/tx.c: Prevent set_channel() from getting called every
time a packet is sent.

2. net/mac802154/mib.c: Lock (pib_lock) accesses to current_channel and
current_page and make sure they are updated when the channel has been
changed.

Signed-off-by: Alan Ott <alan@signal11.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index f03e55f2ebf0f6da14a09d7ee4a3659cf2edc40e..8ded97cf1c33f4336b3a59761095eff575ba6287 100644 (file)
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c
@@ -176,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);
 }
@@ -195,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;
@@ -204,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 3fd3e07ec599becf7c29d537724abcb421fff4c8..6d1647399d4fefb4584a7bdd2c8ac5adf9b05702 100644 (file)
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -58,6 +58,9 @@ 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);