From 1530e82d2219c5a88d92cbe742c39a66a48f4f95 Mon Sep 17 00:00:00 2001 From: "alex.bluesman.smirnov@gmail.com" Date: Mon, 25 Jun 2012 23:24:49 +0000 Subject: [PATCH] --- yaml --- r: 314627 b: refs/heads/master c: dcbe4f93f6d220c22c937f4e305171119b87905e h: refs/heads/master i: 314625: ebac3afac426020c8d0744a676f18116b46662e8 314623: 6498535608260fbd1777a21e6acac17b05abfbec v: v3 --- [refs] | 2 +- trunk/net/mac802154/mac802154.h | 2 ++ trunk/net/mac802154/mib.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c42423945502..16459cf50ddd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32bad7e30f113a8a5cebe4704bf6519ab4383e1b +refs/heads/master: dcbe4f93f6d220c22c937f4e305171119b87905e diff --git a/trunk/net/mac802154/mac802154.h b/trunk/net/mac802154/mac802154.h index c0efcf19a171..5cb7dc286cd1 100644 --- a/trunk/net/mac802154/mac802154.h +++ b/trunk/net/mac802154/mac802154.h @@ -109,5 +109,7 @@ netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb, /* MIB callbacks */ 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); #endif /* MAC802154_H */ diff --git a/trunk/net/mac802154/mib.c b/trunk/net/mac802154/mib.c index ab59821ec729..8e772ed30d1c 100644 --- a/trunk/net/mac802154/mib.c +++ b/trunk/net/mac802154/mib.c @@ -91,3 +91,34 @@ void mac802154_dev_set_ieee_addr(struct net_device *dev) set_hw_addr_filt(dev, IEEE802515_AFILT_IEEEADDR_CHANGED); } } + +u16 mac802154_dev_get_pan_id(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->pan_id; + spin_unlock_bh(&priv->mib_lock); + + return ret; +} + +void mac802154_dev_set_pan_id(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->pan_id = val; + spin_unlock_bh(&priv->mib_lock); + + if ((priv->hw->ops->set_hw_addr_filt) && + (priv->hw->hw.hw_filt.pan_id != priv->pan_id)) { + priv->hw->hw.hw_filt.pan_id = priv->pan_id; + set_hw_addr_filt(dev, IEEE802515_AFILT_PANID_CHANGED); + } +}