Merge branch 'master' into ysato-h8300

[uclinux-h8/linux.git] / include / net / ieee802154_netdev.h

diff --git a/include/net/ieee802154_netdev.h b/include/net/ieee802154_netdev.h
index 83bb8a7..94a2970 100644 (file)
--- a/include/net/ieee802154_netdev.h
+++ b/include/net/ieee802154_netdev.h
@@ -28,6 +28,8 @@
 #include <linux/skbuff.h>
 #include <linux/ieee802154.h>
 
+#include <net/cfg802154.h>
+
 struct ieee802154_sechdr {
 #if defined(__LITTLE_ENDIAN_BITFIELD)
        u8 level:3,
@@ -337,7 +339,7 @@ struct ieee802154_mac_params {
        s8 frame_retries;
 
        bool lbt;
-       u8 cca_mode;
+       struct wpan_phy_cca cca;
        s32 cca_ed_level;
 };