[PATCH net-next 15/15] mac802154: re-introduce MAC primitives required to send/receive packets
DORMANTno replies
From: Tony Cheneau <hidden>
Date: 2012-10-23 04:09:57
Subsystem:
ieee 802.15.4 subsystem, networking [general], the rest · Maintainers:
Alexander Aring, Stefan Schmidt, Miquel Raynal, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
- mlme_assoc_req() and mlme_assoc_resp() are just place holder for the moment (they prevent the two corresponding function pointers in the mac802154_mlme_wpan structure to be left uninitialized) - mac802514_dev_get_bsn() and mac802514_dev_get_dsn() MAC primitives were present in the Linux-Zigbee kernel and are being re-introduced. Signed-off-by: Tony Cheneau <redacted> --- net/mac802154/mac802154.h | 2 ++ net/mac802154/mac_cmd.c | 22 +++++++++++++++++++++- net/mac802154/mib.c | 19 +++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/net/mac802154/mac802154.h b/net/mac802154/mac802154.h
index a4dcaf1..18d4044 100644
--- a/net/mac802154/mac802154.h
+++ b/net/mac802154/mac802154.h@@ -114,5 +114,7 @@ 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); +u8 mac802154_dev_get_bsn(const struct net_device *dev); #endif /* MAC802154_H */
diff --git a/net/mac802154/mac_cmd.c b/net/mac802154/mac_cmd.c
index d8d2770..8e46e7b 100644
--- a/net/mac802154/mac_cmd.c
+++ b/net/mac802154/mac_cmd.c@@ -33,6 +33,22 @@ #include "mac802154.h" +static int mac802154_mlme_assoc_req(struct net_device *dev, + struct ieee802154_addr *addr, + u8 channel, u8 page, u8 cap) +{ + /* TBD */ + return 0; +} + +static int mac802154_mlme_assoc_resp(struct net_device *dev, + struct ieee802154_addr *addr, + u16 short_addr, u8 status) +{ + /* TBD */ + return 0; +} + static int mac802154_mlme_start_req(struct net_device *dev, struct ieee802154_addr *addr, u8 channel, u8 page,
@@ -70,7 +86,11 @@ 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, + .get_dsn = mac802154_dev_get_dsn, + .get_bsn = mac802154_dev_get_bsn, + .start_req = mac802154_mlme_start_req, + .assoc_req = mac802154_mlme_assoc_req, + .assoc_resp = mac802154_mlme_assoc_resp };
diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index 2339f8d..70ab6ca 100644
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c@@ -149,6 +149,25 @@ 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++; +} + +u8 mac802154_dev_get_bsn(const struct net_device *dev) +{ + struct mac802154_sub_if_data *priv = netdev_priv(dev); + + BUG_ON(dev->type != ARPHRD_IEEE802154); + + return priv->bsn++; +} + + static void phy_chan_notify(struct work_struct *work) { struct phy_chan_notify_work *nw = container_of(work,
--
1.7.8.6
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct