mac802154: add get short address method

Add method to get the device short 802.15.4 address. This call
needed by ieee802154 layer to satisfy 'iz list' request from
the user space.

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 69678644a5c204850e4aef562c91e5a2ed9e479a..a4dcaf1dd4b6e2cf29c47a1f4cc2084fe16ca735 100644 (file)
--- a/net/mac802154/mac802154.h
+++ b/net/mac802154/mac802154.h
@@ -109,6 +109,7 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb,
 
 /* MIB callbacks */
 void mac802154_dev_set_short_addr(struct net_device *dev, u16 val);
+u16 mac802154_dev_get_short_addr(const struct net_device *dev);
 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/mac_cmd.c b/net/mac802154/mac_cmd.c
index 7f5403e5ea9115ba164584fa17945e346dafa79d..5d9a47b27938a3112361098a4a404b4b97f24937 100644 (file)
--- a/net/mac802154/mac_cmd.c
+++ b/net/mac802154/mac_cmd.c
@@ -71,4 +71,6 @@ struct ieee802154_reduced_mlme_ops mac802154_mlme_reduced = {
 struct ieee802154_mlme_ops mac802154_mlme_wpan = {
        .get_phy = mac802154_get_phy,
        .start_req = mac802154_mlme_start_req,
+       .get_pan_id = mac802154_dev_get_pan_id,
+       .get_short_addr = mac802154_dev_get_short_addr,
 };

diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index 380829d8460059eb7a4c80f2d8cfe7b37827751f..5c66b8f73f023eb1f944bd77968469d96bebcd3a 100644 (file)
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c
@@ -100,6 +100,20 @@ void mac802154_dev_set_short_addr(struct net_device *dev, u16 val)
        }
 }
 
+u16 mac802154_dev_get_short_addr(const struct net_device *dev)
+{
+       struct mac802154_sub_if_data *priv = netdev_priv(dev);
+       u16 ret;
+
+       BUG_ON(dev->type != ARPHRD_IEEE802154);
+
+       spin_lock_bh(&priv->mib_lock);
+       ret = priv->short_addr;
+       spin_unlock_bh(&priv->mib_lock);
+
+       return ret;
+}
+
 void mac802154_dev_set_ieee_addr(struct net_device *dev)
 {
        struct mac802154_sub_if_data *priv = netdev_priv(dev);