parent
b6cd42a54e
commit
859d940c79
@ -1,61 +0,0 @@ |
||||
From: Masashi Honma <masashi.honma@gmail.com>
|
||||
Date: Tue, 26 Jul 2016 11:45:40 +0900
|
||||
Subject: [PATCH] mesh: Set correct secondary channel offset if HT40 is
|
||||
disabled
|
||||
|
||||
Previously, secondary channel offset could be non zero even though
|
||||
disable_ht40=1. This patch fixes it.
|
||||
|
||||
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
|
||||
---
|
||||
|
||||
--- a/wpa_supplicant/wpa_supplicant.c
|
||||
+++ b/wpa_supplicant/wpa_supplicant.c
|
||||
@@ -1901,20 +1901,27 @@ void ibss_mesh_setup_freq(struct wpa_sup
|
||||
break;
|
||||
}
|
||||
}
|
||||
+#ifdef CONFIG_HT_OVERRIDES
|
||||
+ if (ssid->disable_ht40)
|
||||
+ ht40 = 0;
|
||||
+#endif /* CONFIG_HT_OVERRIDES */
|
||||
|
||||
- /* Find secondary channel */
|
||||
- for (i = 0; i < mode->num_channels; i++) {
|
||||
- sec_chan = &mode->channels[i];
|
||||
- if (sec_chan->chan == channel + ht40 * 4)
|
||||
- break;
|
||||
- sec_chan = NULL;
|
||||
- }
|
||||
- if (!sec_chan)
|
||||
- return;
|
||||
+ if (ht40) {
|
||||
+ /* Find secondary channel */
|
||||
+ for (i = 0; i < mode->num_channels; i++) {
|
||||
+ sec_chan = &mode->channels[i];
|
||||
+ if (sec_chan->chan == channel + ht40 * 4)
|
||||
+ break;
|
||||
+ sec_chan = NULL;
|
||||
+ }
|
||||
+ if (!sec_chan)
|
||||
+ return;
|
||||
|
||||
- /* Check secondary channel flags */
|
||||
- if (sec_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
|
||||
- return;
|
||||
+ /* Check secondary channel flags */
|
||||
+ if (sec_chan->flag &
|
||||
+ (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
|
||||
+ return;
|
||||
+ }
|
||||
|
||||
freq->channel = pri_chan->chan;
|
||||
|
||||
@@ -1930,6 +1937,7 @@ void ibss_mesh_setup_freq(struct wpa_sup
|
||||
freq->sec_channel_offset = 1;
|
||||
break;
|
||||
default:
|
||||
+ freq->sec_channel_offset = 0;
|
||||
break;
|
||||
}
|
||||
|
@ -1,12 +0,0 @@ |
||||
--- a/src/drivers/driver_nl80211.c
|
||||
+++ b/src/drivers/driver_nl80211.c
|
||||
@@ -2332,7 +2332,8 @@ wpa_driver_nl80211_finish_drv_init(struc
|
||||
|
||||
if (drv->hostapd || bss->static_ap)
|
||||
nlmode = NL80211_IFTYPE_AP;
|
||||
- else if (bss->if_dynamic)
|
||||
+ else if (bss->if_dynamic ||
|
||||
+ nl80211_get_ifmode(bss) == NL80211_IFTYPE_MESH_POINT)
|
||||
nlmode = nl80211_get_ifmode(bss);
|
||||
else
|
||||
nlmode = NL80211_IFTYPE_STATION;
|
@ -1,10 +0,0 @@ |
||||
--- a/hostapd/config_file.c
|
||||
+++ b/hostapd/config_file.c
|
||||
@@ -645,6 +645,7 @@ static int hostapd_parse_das_client(stru
|
||||
if (secret == NULL)
|
||||
return -1;
|
||||
|
||||
+ *secret = 0;
|
||||
secret++;
|
||||
|
||||
if (hostapd_parse_ip_addr(val, &bss->radius_das_client_addr))
|
Loading…
Reference in new issue