Merge tag 'nfs-for-3.10-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[platform/adaptation/renesas_rcar/renesas_kernel.git] / net / mac802154 / mib.c

diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index f03e55f..8ded97c 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);
 }