aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac802154
diff options
context:
space:
mode:
authoralex.bluesman.smirnov@gmail.com <alex.bluesman.smirnov@gmail.com>2012-06-25 19:24:50 -0400
committerDavid S. Miller <davem@davemloft.net>2012-06-27 00:06:11 -0400
commit48e44d5057144b4e28615e3e1ce725b2ca887b40 (patch)
tree5ef20eaeaa3c765afa3adde699fb29a6fcf85171 /net/mac802154
parentdcbe4f93f6d220c22c937f4e305171119b87905e (diff)
mac802154: short address setter
A method to assign the IEEE802.15.4 short address was added to the MIB implementation. Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac802154')
-rw-r--r--net/mac802154/mac802154.h1
-rw-r--r--net/mac802154/mib.c17
2 files changed, 18 insertions, 0 deletions
diff --git a/net/mac802154/mac802154.h b/net/mac802154/mac802154.h
index 5cb7dc286cd1..995107203ddc 100644
--- a/net/mac802154/mac802154.h
+++ b/net/mac802154/mac802154.h
@@ -108,6 +108,7 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb,
108 u8 page, u8 chan); 108 u8 page, u8 chan);
109 109
110/* MIB callbacks */ 110/* MIB callbacks */
111void mac802154_dev_set_short_addr(struct net_device *dev, u16 val);
111void mac802154_dev_set_ieee_addr(struct net_device *dev); 112void mac802154_dev_set_ieee_addr(struct net_device *dev);
112u16 mac802154_dev_get_pan_id(const struct net_device *dev); 113u16 mac802154_dev_get_pan_id(const struct net_device *dev);
113void mac802154_dev_set_pan_id(struct net_device *dev, u16 val); 114void mac802154_dev_set_pan_id(struct net_device *dev, u16 val);
diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index 8e772ed30d1c..d74503b4302f 100644
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c
@@ -78,6 +78,23 @@ static void set_hw_addr_filt(struct net_device *dev, unsigned long changed)
78 return; 78 return;
79} 79}
80 80
81void mac802154_dev_set_short_addr(struct net_device *dev, u16 val)
82{
83 struct mac802154_sub_if_data *priv = netdev_priv(dev);
84
85 BUG_ON(dev->type != ARPHRD_IEEE802154);
86
87 spin_lock_bh(&priv->mib_lock);
88 priv->short_addr = val;
89 spin_unlock_bh(&priv->mib_lock);
90
91 if ((priv->hw->ops->set_hw_addr_filt) &&
92 (priv->hw->hw.hw_filt.short_addr != priv->short_addr)) {
93 priv->hw->hw.hw_filt.short_addr = priv->short_addr;
94 set_hw_addr_filt(dev, IEEE802515_AFILT_SADDR_CHANGED);
95 }
96}
97
81void mac802154_dev_set_ieee_addr(struct net_device *dev) 98void mac802154_dev_set_ieee_addr(struct net_device *dev)
82{ 99{
83 struct mac802154_sub_if_data *priv = netdev_priv(dev); 100 struct mac802154_sub_if_data *priv = netdev_priv(dev);