3 files changed, 17 insertions, 0 deletions

diff --git a/net/mac802154/mac802154.h b/net/mac802154/mac802154.h
index 69678644a5c2..a4dcaf1dd4b6 100644
--- 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 7f5403e5ea91..5d9a47b27938 100644
--- 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 380829d84600..5c66b8f73f02 100644
--- 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);