Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[firefly-linux-kernel-4.4.55.git] / net / mac802154 / mac802154.h

diff --git a/net/mac802154/mac802154.h b/net/mac802154/mac802154.h
index 4619486f1da21e728b609f94d785ce683426ccdf..28ef59c566e6ee78df73edd1246d84d4c2c4d912 100644 (file)
--- a/net/mac802154/mac802154.h
+++ b/net/mac802154/mac802154.h
@@ -23,6 +23,8 @@
 #ifndef MAC802154_H
 #define MAC802154_H
 
+#include <net/ieee802154_netdev.h>
+
 /* mac802154 device private data */
 struct mac802154_priv {
        struct ieee802154_dev hw;
@@ -71,6 +73,7 @@ struct mac802154_sub_if_data {
        struct net_device *dev;
 
        int type;
+       bool running;
 
        spinlock_t mib_lock;
 
@@ -81,6 +84,8 @@ struct mac802154_sub_if_data {
        u8 chan;
        u8 page;
 
+       struct ieee802154_mac_params mac_params;
+
        /* MAC BSN field */
        u8 bsn;
        /* MAC DSN field */
@@ -115,4 +120,9 @@ void mac802154_dev_set_pan_id(struct net_device *dev, __le16 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);
 
+int mac802154_set_mac_params(struct net_device *dev,
+                            const struct ieee802154_mac_params *params);
+void mac802154_get_mac_params(struct net_device *dev,
+                             struct ieee802154_mac_params *params);
+
 #endif /* MAC802154_H */