From 7bfbfed404d2e11c5c2b04742f6347588e5b6bdd Mon Sep 17 00:00:00 2001 From: "alex.bluesman.smirnov@gmail.com" Date: Tue, 10 Jul 2012 21:22:44 +0000 Subject: [PATCH] --- yaml --- r: 315145 b: refs/heads/master c: e885a47a474fe53ed7d952af4b6e9a5cf86d9a07 h: refs/heads/master i: 315143: 37e8edbd2418a69bb6a1698dfb3a169bc62dbcb7 v: v3 --- [refs] | 2 +- trunk/net/mac802154/mac802154.h | 1 + trunk/net/mac802154/mac_cmd.c | 2 ++ trunk/net/mac802154/mib.c | 14 ++++++++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 42399076ff98..d26402376a30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b00f2eef3a3b085f702675e8158b8eaf0fb663d +refs/heads/master: e885a47a474fe53ed7d952af4b6e9a5cf86d9a07 diff --git a/trunk/net/mac802154/mac802154.h b/trunk/net/mac802154/mac802154.h index 69678644a5c2..a4dcaf1dd4b6 100644 --- a/trunk/net/mac802154/mac802154.h +++ b/trunk/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/trunk/net/mac802154/mac_cmd.c b/trunk/net/mac802154/mac_cmd.c index 7f5403e5ea91..5d9a47b27938 100644 --- a/trunk/net/mac802154/mac_cmd.c +++ b/trunk/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/trunk/net/mac802154/mib.c b/trunk/net/mac802154/mib.c index 380829d84600..5c66b8f73f02 100644 --- a/trunk/net/mac802154/mib.c +++ b/trunk/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);