aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-11-05 14:51:18 -0500
committerMarcel Holtmann <marcel@holtmann.org>2014-11-05 15:53:04 -0500
commitbd28a11f25f2c2a563620e7be588dc4dd8a91396 (patch)
tree52d9a31150389f22e98774d3b26cec1fe7517608 /include/net
parentd5ae67bacd9654b0e26b9f248249e9ee1b6e338b (diff)
ieee802154: remove mlme get_phy callback
This patch removes the get_phy callback from mlme ops structure. Instead we doing a dereference via ieee802154_ptr dev pointer. For backwards compatibility we need to run get_device after dereference wpan_phy via ieee802154_ptr. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ieee802154_netdev.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/include/net/ieee802154_netdev.h b/include/net/ieee802154_netdev.h
index 5e62d758eea5..83bb8a73d23c 100644
--- a/include/net/ieee802154_netdev.h
+++ b/include/net/ieee802154_netdev.h
@@ -423,8 +423,6 @@ struct ieee802154_mlme_ops {
423 423
424 /* The fields below are required. */ 424 /* The fields below are required. */
425 425
426 struct wpan_phy *(*get_phy)(const struct net_device *dev);
427
428 /* 426 /*
429 * FIXME: these should become the part of PIB/MIB interface. 427 * FIXME: these should become the part of PIB/MIB interface.
430 * However we still don't have IB interface of any kind 428 * However we still don't have IB interface of any kind
@@ -434,16 +432,6 @@ struct ieee802154_mlme_ops {
434 u8 (*get_dsn)(const struct net_device *dev); 432 u8 (*get_dsn)(const struct net_device *dev);
435}; 433};
436 434
437/* The IEEE 802.15.4 standard defines 2 type of the devices:
438 * - FFD - full functionality device
439 * - RFD - reduce functionality device
440 *
441 * So 2 sets of mlme operations are needed
442 */
443struct ieee802154_reduced_mlme_ops {
444 struct wpan_phy *(*get_phy)(const struct net_device *dev);
445};
446
447static inline struct ieee802154_mlme_ops * 435static inline struct ieee802154_mlme_ops *
448ieee802154_mlme_ops(const struct net_device *dev) 436ieee802154_mlme_ops(const struct net_device *dev)
449{ 437{