aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralex.bluesman.smirnov@gmail.com <alex.bluesman.smirnov@gmail.com>2012-06-25 19:24:49 -0400
committerDavid S. Miller <davem@davemloft.net>2012-06-27 00:06:11 -0400
commitdcbe4f93f6d220c22c937f4e305171119b87905e (patch)
treef5075b2465fd25e541fb02de11fa1cd77f58bf2a
parent32bad7e30f113a8a5cebe4704bf6519ab4383e1b (diff)
mac802154: set and get PAN id
Two methods intended to get and set the Private Area Network identifier were added to the MIB implementation. Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/mac802154/mac802154.h2
-rw-r--r--net/mac802154/mib.c31
2 files changed, 33 insertions, 0 deletions
diff --git a/net/mac802154/mac802154.h b/net/mac802154/mac802154.h
index c0efcf19a171..5cb7dc286cd1 100644
--- a/net/mac802154/mac802154.h
+++ b/net/mac802154/mac802154.h
@@ -109,5 +109,7 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb,
109 109
110/* MIB callbacks */ 110/* MIB callbacks */
111void mac802154_dev_set_ieee_addr(struct net_device *dev); 111void mac802154_dev_set_ieee_addr(struct net_device *dev);
112u16 mac802154_dev_get_pan_id(const struct net_device *dev);
113void mac802154_dev_set_pan_id(struct net_device *dev, u16 val);
112 114
113#endif /* MAC802154_H */ 115#endif /* MAC802154_H */
diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index ab59821ec729..8e772ed30d1c 100644
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c
@@ -91,3 +91,34 @@ void mac802154_dev_set_ieee_addr(struct net_device *dev)
91 set_hw_addr_filt(dev, IEEE802515_AFILT_IEEEADDR_CHANGED); 91 set_hw_addr_filt(dev, IEEE802515_AFILT_IEEEADDR_CHANGED);
92 } 92 }
93} 93}
94
95u16 mac802154_dev_get_pan_id(const struct net_device *dev)
96{
97 struct mac802154_sub_if_data *priv = netdev_priv(dev);
98 u16 ret;
99
100 BUG_ON(dev->type != ARPHRD_IEEE802154);
101
102 spin_lock_bh(&priv->mib_lock);
103 ret = priv->pan_id;
104 spin_unlock_bh(&priv->mib_lock);
105
106 return ret;
107}
108
109void mac802154_dev_set_pan_id(struct net_device *dev, u16 val)
110{
111 struct mac802154_sub_if_data *priv = netdev_priv(dev);
112
113 BUG_ON(dev->type != ARPHRD_IEEE802154);
114
115 spin_lock_bh(&priv->mib_lock);
116 priv->pan_id = val;
117 spin_unlock_bh(&priv->mib_lock);
118
119 if ((priv->hw->ops->set_hw_addr_filt) &&
120 (priv->hw->hw.hw_filt.pan_id != priv->pan_id)) {
121 priv->hw->hw.hw_filt.pan_id = priv->pan_id;
122 set_hw_addr_filt(dev, IEEE802515_AFILT_PANID_CHANGED);
123 }
124}