From f85d23622e0c55179d011484536d9ecfa84bb4b0 Mon Sep 17 00:00:00 2001 From: Tony Cheneau Date: Mon, 25 Mar 2013 17:59:29 +0000 Subject: [PATCH] --- yaml --- r: 368687 b: refs/heads/master c: 0483546a3de329cad7705d42962edb09a28794c6 h: refs/heads/master i: 368685: 599df005ba5db78b2106ca30a2efd141b02c5795 368683: 349a6efbd85e512f1c0481986a6c6d0277a263d6 368679: e807bcd564088b19b65b94fceb7231ce44021a7d 368671: f563e246dc791a9f5efb5bbd9a9ab50cc67656f1 v: v3 --- [refs] | 2 +- trunk/net/mac802154/mac802154.h | 1 + trunk/net/mac802154/mac_cmd.c | 1 + trunk/net/mac802154/mib.c | 9 +++++++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2df5e751ab4e..f55e5ea9ec40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4ac32365dcbfd341a87eae444c26679f889249a +refs/heads/master: 0483546a3de329cad7705d42962edb09a28794c6 diff --git a/trunk/net/mac802154/mac802154.h b/trunk/net/mac802154/mac802154.h index a4dcaf1dd4b6..21fa386f4675 100644 --- a/trunk/net/mac802154/mac802154.h +++ b/trunk/net/mac802154/mac802154.h @@ -114,5 +114,6 @@ 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); void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan); +u8 mac802154_dev_get_dsn(const struct net_device *dev); #endif /* MAC802154_H */ diff --git a/trunk/net/mac802154/mac_cmd.c b/trunk/net/mac802154/mac_cmd.c index d8d277006089..a99910d4d52f 100644 --- a/trunk/net/mac802154/mac_cmd.c +++ b/trunk/net/mac802154/mac_cmd.c @@ -73,4 +73,5 @@ struct ieee802154_mlme_ops mac802154_mlme_wpan = { .start_req = mac802154_mlme_start_req, .get_pan_id = mac802154_dev_get_pan_id, .get_short_addr = mac802154_dev_get_short_addr, + .get_dsn = mac802154_dev_get_dsn, }; diff --git a/trunk/net/mac802154/mib.c b/trunk/net/mac802154/mib.c index f47781ab0ccc..f03e55f2ebf0 100644 --- a/trunk/net/mac802154/mib.c +++ b/trunk/net/mac802154/mib.c @@ -159,6 +159,15 @@ void mac802154_dev_set_pan_id(struct net_device *dev, u16 val) } } +u8 mac802154_dev_get_dsn(const struct net_device *dev) +{ + struct mac802154_sub_if_data *priv = netdev_priv(dev); + + BUG_ON(dev->type != ARPHRD_IEEE802154); + + return priv->dsn++; +} + static void phy_chan_notify(struct work_struct *work) { struct phy_chan_notify_work *nw = container_of(work,