diff options
author | Alexander Aring <alex.aring@gmail.com> | 2014-12-10 09:33:13 -0500 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-12-18 18:19:23 -0500 |
commit | ba2a9506a76450568cbc0d51626d94cf8528c0c7 (patch) | |
tree | 71f548777d889121041d978c7806db22b04235d1 /include | |
parent | 7fe9a3882bb37195c41ab125a0f2852398d2646a (diff) |
nl802154: introduce support for cca settings
This patch adds support for setting cca parameters via nl802154.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/cfg802154.h | 3 | ||||
-rw-r--r-- | include/net/nl802154.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/net/cfg802154.h b/include/net/cfg802154.h index 6ee2618ac78a..eeda67652766 100644 --- a/include/net/cfg802154.h +++ b/include/net/cfg802154.h | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <net/nl802154.h> | 25 | #include <net/nl802154.h> |
26 | 26 | ||
27 | struct wpan_phy; | 27 | struct wpan_phy; |
28 | struct wpan_phy_cca; | ||
28 | 29 | ||
29 | struct cfg802154_ops { | 30 | struct cfg802154_ops { |
30 | struct net_device * (*add_virtual_intf_deprecated)(struct wpan_phy *wpan_phy, | 31 | struct net_device * (*add_virtual_intf_deprecated)(struct wpan_phy *wpan_phy, |
@@ -39,6 +40,8 @@ struct cfg802154_ops { | |||
39 | int (*del_virtual_intf)(struct wpan_phy *wpan_phy, | 40 | int (*del_virtual_intf)(struct wpan_phy *wpan_phy, |
40 | struct wpan_dev *wpan_dev); | 41 | struct wpan_dev *wpan_dev); |
41 | int (*set_channel)(struct wpan_phy *wpan_phy, u8 page, u8 channel); | 42 | int (*set_channel)(struct wpan_phy *wpan_phy, u8 page, u8 channel); |
43 | int (*set_cca_mode)(struct wpan_phy *wpan_phy, | ||
44 | const struct wpan_phy_cca *cca); | ||
42 | int (*set_pan_id)(struct wpan_phy *wpan_phy, | 45 | int (*set_pan_id)(struct wpan_phy *wpan_phy, |
43 | struct wpan_dev *wpan_dev, __le16 pan_id); | 46 | struct wpan_dev *wpan_dev, __le16 pan_id); |
44 | int (*set_short_addr)(struct wpan_phy *wpan_phy, | 47 | int (*set_short_addr)(struct wpan_phy *wpan_phy, |
diff --git a/include/net/nl802154.h b/include/net/nl802154.h index 86c1b2f15b57..f8b5bc997959 100644 --- a/include/net/nl802154.h +++ b/include/net/nl802154.h | |||
@@ -82,7 +82,7 @@ enum nl802154_attrs { | |||
82 | NL802154_ATTR_TX_POWER, | 82 | NL802154_ATTR_TX_POWER, |
83 | 83 | ||
84 | NL802154_ATTR_CCA_MODE, | 84 | NL802154_ATTR_CCA_MODE, |
85 | NL802154_ATTR_CCA_MODE3_AND, | 85 | NL802154_ATTR_CCA_OPT, |
86 | NL802154_ATTR_CCA_ED_LEVEL, | 86 | NL802154_ATTR_CCA_ED_LEVEL, |
87 | 87 | ||
88 | NL802154_ATTR_MAX_FRAME_RETRIES, | 88 | NL802154_ATTR_MAX_FRAME_RETRIES, |