Renamed nl80211 HT channel parameters to match with kernel

diff --git a/hostapd/driver_nl80211.c b/hostapd/driver_nl80211.c
index 3da4184..6d83ccf 100644 (file)
--- a/hostapd/driver_nl80211.c
+++ b/hostapd/driver_nl80211.c
@@ -502,16 +502,16 @@ static int i802_set_freq2(void *priv, struct hostapd_freq_params *freq)
        if (freq->ht_enabled) {
                switch (freq->sec_channel_offset) {
                case -1:
-                       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET,
-                                   NL80211_SEC_CHAN_BELOW);
+                       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
+                                   NL80211_CHAN_HT40MINUS);
                        break;
                case 1:
-                       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET,
-                                   NL80211_SEC_CHAN_ABOVE);
+                       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
+                                   NL80211_CHAN_HT40PLUS);
                        break;
                default:
-                       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET,
-                                   NL80211_SEC_CHAN_DISABLED);
+                       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
+                                   NL80211_CHAN_HT20);
                        break;
                }
        }

diff --git a/src/common/nl80211_copy.h b/src/common/nl80211_copy.h
index 04d4516..0fc403a 100644 (file)
--- a/src/common/nl80211_copy.h
+++ b/src/common/nl80211_copy.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 */
 
@@ -774,10 +774,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 */