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>

diff --git a/net/mac802154/mac802154.h b/net/mac802154/mac802154.h
index 5cb7dc286cd1f95a5ffe8f36a70367796588da4e..995107203ddc0a3364cd2e868e5b9929d1b8159b 100644 (file)
--- 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,
                         u8 page, u8 chan);
 
 /* MIB callbacks */
+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);

diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index 8e772ed30d1cd7a5bc9d974a20672cbcc69c83ad..d74503b4302f25e401c91a416bd6c5d22298c6af 100644 (file)
--- 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)
        return;
 }
 
+void mac802154_dev_set_short_addr(struct net_device *dev, u16 val)
+{
+       struct mac802154_sub_if_data *priv = netdev_priv(dev);
+
+       BUG_ON(dev->type != ARPHRD_IEEE802154);
+
+       spin_lock_bh(&priv->mib_lock);
+       priv->short_addr = val;
+       spin_unlock_bh(&priv->mib_lock);
+
+       if ((priv->hw->ops->set_hw_addr_filt) &&
+           (priv->hw->hw.hw_filt.short_addr != priv->short_addr)) {
+               priv->hw->hw.hw_filt.short_addr = priv->short_addr;
+               set_hw_addr_filt(dev, IEEE802515_AFILT_SADDR_CHANGED);
+       }
+}
+
 void mac802154_dev_set_ieee_addr(struct net_device *dev)
 {
        struct mac802154_sub_if_data *priv = netdev_priv(dev);