]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
Allow disable_ht to override 11n configuration in AP mode
authorVasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Wed, 11 Apr 2012 13:24:03 +0000 (16:24 +0300)
committerJouni Malinen <j@w1.fi>
Wed, 11 Apr 2012 13:24:03 +0000 (16:24 +0300)
This is being done only for station mode, extend it to AP mode as well.

Signed-hostap: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>

wpa_supplicant/ap.c

index d0fb1b0560b5b09e471d18fa26b735c4f84794a3..386e2a45884ca0f17647388da3eb1e3f17c57a3d 100644 (file)
@@ -81,14 +81,23 @@ static int wpa_supplicant_conf_ap(struct wpa_supplicant *wpa_s,
         */
        if (wpa_s->hw.modes) {
                struct hostapd_hw_modes *mode = NULL;
-               int i;
+               int i, no_ht = 0;
                for (i = 0; i < wpa_s->hw.num_modes; i++) {
                        if (wpa_s->hw.modes[i].mode == conf->hw_mode) {
                                mode = &wpa_s->hw.modes[i];
                                break;
                        }
                }
-               if (mode && mode->ht_capab) {
+
+#ifdef CONFIG_HT_OVERRIDES
+               if (ssid->disable_ht) {
+                       conf->ieee80211n = 0;
+                       conf->ht_capab = 0;
+                       no_ht = 1;
+               }
+#endif /* CONFIG_HT_OVERRIDES */
+
+               if (!no_ht && mode && mode->ht_capab) {
                        conf->ieee80211n = 1;
 
                        /*