mac802154: page and channel setter

A new method to set page and channel values for a transceiver
was added to the MIB.

Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mac802154/mac802154.h b/net/mac802154/mac802154.h
index 995107203ddc0a3364cd2e868e5b9929d1b8159b..69678644a5c204850e4aef562c91e5a2ed9e479a 100644 (file)
--- a/net/mac802154/mac802154.h
+++ b/net/mac802154/mac802154.h
@@ -112,5 +112,6 @@ void mac802154_dev_set_short_addr(struct net_device *dev, u16 val);
 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);
 
 #endif /* MAC802154_H */

diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index d74503b4302f25e401c91a416bd6c5d22298c6af..380829d8460059eb7a4c80f2d8cfe7b37827751f 100644 (file)
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c
@@ -28,6 +28,11 @@
 
 #include "mac802154.h"
 
+struct phy_chan_notify_work {
+       struct work_struct work;
+       struct net_device *dev;
+};
+
 struct hw_addr_filt_notify_work {
        struct work_struct work;
        struct net_device *dev;
@@ -139,3 +144,42 @@ void mac802154_dev_set_pan_id(struct net_device *dev, u16 val)
                set_hw_addr_filt(dev, IEEE802515_AFILT_PANID_CHANGED);
        }
 }
+
+static void phy_chan_notify(struct work_struct *work)
+{
+       struct phy_chan_notify_work *nw = container_of(work,
+                                         struct phy_chan_notify_work, work);
+       struct mac802154_priv *hw = mac802154_slave_get_priv(nw->dev);
+       struct mac802154_sub_if_data *priv = netdev_priv(nw->dev);
+       int res;
+
+       res = hw->ops->set_channel(&hw->hw, priv->page, priv->chan);
+       if (res)
+               pr_debug("set_channel failed\n");
+
+       kfree(nw);
+}
+
+void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan)
+{
+       struct mac802154_sub_if_data *priv = netdev_priv(dev);
+       struct phy_chan_notify_work *work;
+
+       BUG_ON(dev->type != ARPHRD_IEEE802154);
+
+       spin_lock_bh(&priv->mib_lock);
+       priv->page = page;
+       priv->chan = chan;
+       spin_unlock_bh(&priv->mib_lock);
+
+       if (priv->hw->phy->current_channel != priv->chan ||
+           priv->hw->phy->current_page != priv->page) {
+               work = kzalloc(sizeof(*work), GFP_ATOMIC);
+               if (!work)
+                       return;
+
+               INIT_WORK(&work->work, phy_chan_notify);
+               work->dev = dev;
+               queue_work(priv->hw->dev_workqueue, &work->work);
+       }
+}