mac80211: Fix HT channel selection

HT management is done differently for AP and STA modes, unify
to just the ->config() callback since HT is fundamentally a
PHY property and cannot be per-BSS.

Rename enum nl80211_sec_chan_offset as nl80211_channel_type to denote
the channel type ( NO_HT, HT20, HT40+, HT40- ).

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 11 insertions, 11 deletions

diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 7501acfcfdc..e86ed59f9ad 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -201,13 +201,13 @@ enum nl80211_commands {
  * @NL80211_ATTR_WIPHY_NAME: wiphy name (used for renaming)
  * @NL80211_ATTR_WIPHY_TXQ_PARAMS: a nested array of TX queue parameters
  * @NL80211_ATTR_WIPHY_FREQ: frequency of the selected channel in MHz
- * @NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET: included with NL80211_ATTR_WIPHY_FREQ
+ * @NL80211_ATTR_WIPHY_CHANNEL_TYPE: included with NL80211_ATTR_WIPHY_FREQ
  *      if HT20 or HT40 are allowed (i.e., 802.11n disabled if not included):
- *      NL80211_SEC_CHAN_NO_HT = HT not allowed (i.e., same as not including
+ *      NL80211_CHAN_NO_HT = HT not allowed (i.e., same as not including
  *              this attribute)
- *      NL80211_SEC_CHAN_DISABLED = HT20 only
- *      NL80211_SEC_CHAN_BELOW = secondary channel is below the primary channel
- *      NL80211_SEC_CHAN_ABOVE = secondary channel is above the primary channel
+ *      NL80211_CHAN_HT20 = HT20 only
+ *      NL80211_CHAN_HT40MINUS = secondary channel is below the primary channel
+ *      NL80211_CHAN_HT40PLUS = secondary channel is above the primary channel
  *
  * @NL80211_ATTR_IFINDEX: network interface index of the device to operate on
  * @NL80211_ATTR_IFNAME: network interface name
@@ -344,7 +344,7 @@ enum nl80211_attrs {
 
         NL80211_ATTR_WIPHY_TXQ_PARAMS,
         NL80211_ATTR_WIPHY_FREQ,
-        NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET,
+        NL80211_ATTR_WIPHY_CHANNEL_TYPE,
 
         /* add attributes here, update the policy in nl80211.c */
 
@@ -805,10 +805,10 @@ enum nl80211_txq_q {
         NL80211_TXQ_Q_BK
 };
 
-enum nl80211_sec_chan_offset {
-        NL80211_SEC_CHAN_NO_HT /* No HT */,
-        NL80211_SEC_CHAN_DISABLED /* HT20 only */,
-        NL80211_SEC_CHAN_BELOW /* HT40- */,
-        NL80211_SEC_CHAN_ABOVE /* HT40+ */
+enum nl80211_channel_type {
+        NL80211_CHAN_NO_HT,
+        NL80211_CHAN_HT20,
+        NL80211_CHAN_HT40MINUS,
+        NL80211_CHAN_HT40PLUS
 };
 #endif /* __LINUX_NL80211_H */