Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu...

[karo-tx-linux.git] / include / net / cfg802154.h

diff --git a/include/net/cfg802154.h b/include/net/cfg802154.h
index 290a9a69af0788794619b0ededc4a6ccfbab5e07..76b1ffaea863600be09280cc4c2d168dc5bae41f 100644 (file)
--- a/include/net/cfg802154.h
+++ b/include/net/cfg802154.h
@@ -34,6 +34,8 @@ struct cfg802154_ops {
                                                           int type);
        void    (*del_virtual_intf_deprecated)(struct wpan_phy *wpan_phy,
                                               struct net_device *dev);
+       int     (*suspend)(struct wpan_phy *wpan_phy);
+       int     (*resume)(struct wpan_phy *wpan_phy);
        int     (*add_virtual_intf)(struct wpan_phy *wpan_phy,
                                    const char *name,
                                    unsigned char name_assign_type,
@@ -61,6 +63,8 @@ struct cfg802154_ops {
                                         s8 max_frame_retries);
        int     (*set_lbt_mode)(struct wpan_phy *wpan_phy,
                                struct wpan_dev *wpan_dev, bool mode);
+       int     (*set_ackreq_default)(struct wpan_phy *wpan_phy,
+                                     struct wpan_dev *wpan_dev, bool ackreq);
 };
 
 static inline bool
@@ -171,6 +175,9 @@ struct wpan_dev {
        struct list_head list;
        struct net_device *netdev;
 
+       /* lowpan interface, set when the wpan_dev belongs to one lowpan_dev */
+       struct net_device *lowpan_dev;
+
        u32 identifier;
 
        /* MAC PIB */
@@ -191,6 +198,9 @@ struct wpan_dev {
        bool lbt;
 
        bool promiscuous_mode;
+
+       /* fallback for acknowledgment bit setting */
+       bool ackreq;
 };
 
 #define to_phy(_dev)   container_of(_dev, struct wpan_phy, dev)