diff options
author | Ashok Nagarajan <ashok@cozybit.com> | 2012-04-30 17:20:32 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-05-08 21:53:59 -0400 |
commit | 70c33eaae79e53f9e48324736c0cb85534d3f093 (patch) | |
tree | 103c59d0356e55341052adca0624b6256525ddbb /include | |
parent | b91e64aad2c78b0477b9eb3a26335668b4032002 (diff) |
{nl,cfg,mac}80211: Allow user to see/configure HT protection mode
This patch introduces a new mesh configuration parameter "ht_opmode" and will
allow user to check the current HT protection mode selected. Users could
configure the protection mode by the command "iw mesh_iface set mesh_param
mesh_ht_protection_mode=2". The default protection mode of mesh is set to
non-HT mixed mode.
Signed-off-by: Ashok Nagarajan <ashok@cozybit.com>
Reviewed-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/nl80211.h | 3 | ||||
-rw-r--r-- | include/net/cfg80211.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h index 1335084b1c69..2540e86d99ab 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h | |||
@@ -2154,6 +2154,8 @@ enum nl80211_mntr_flags { | |||
2154 | * @NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR: maximum number of neighbors | 2154 | * @NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR: maximum number of neighbors |
2155 | * to synchronize to for 11s default synchronization method (see 11C.12.2.2) | 2155 | * to synchronize to for 11s default synchronization method (see 11C.12.2.2) |
2156 | * | 2156 | * |
2157 | * @NL80211_MESHCONF_HT_OPMODE: set mesh HT protection mode. | ||
2158 | * | ||
2157 | * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use | 2159 | * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use |
2158 | */ | 2160 | */ |
2159 | enum nl80211_meshconf_params { | 2161 | enum nl80211_meshconf_params { |
@@ -2179,6 +2181,7 @@ enum nl80211_meshconf_params { | |||
2179 | NL80211_MESHCONF_FORWARDING, | 2181 | NL80211_MESHCONF_FORWARDING, |
2180 | NL80211_MESHCONF_RSSI_THRESHOLD, | 2182 | NL80211_MESHCONF_RSSI_THRESHOLD, |
2181 | NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR, | 2183 | NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR, |
2184 | NL80211_MESHCONF_HT_OPMODE, | ||
2182 | 2185 | ||
2183 | /* keep last */ | 2186 | /* keep last */ |
2184 | __NL80211_MESHCONF_ATTR_AFTER_LAST, | 2187 | __NL80211_MESHCONF_ATTR_AFTER_LAST, |
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 27f956101bbd..adb2320bccdf 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
@@ -821,6 +821,7 @@ struct mesh_config { | |||
821 | bool dot11MeshGateAnnouncementProtocol; | 821 | bool dot11MeshGateAnnouncementProtocol; |
822 | bool dot11MeshForwarding; | 822 | bool dot11MeshForwarding; |
823 | s32 rssi_threshold; | 823 | s32 rssi_threshold; |
824 | u16 ht_opmode; | ||
824 | }; | 825 | }; |
825 | 826 | ||
826 | /** | 827 | /** |