OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 31... Line 31...
31 wpa_supplicant/wpa_supplicant.c | 18 +++++++++++++----- 31 wpa_supplicant/wpa_supplicant.c | 18 +++++++++++++-----
32 1 file changed, 13 insertions(+), 5 deletions(-) 32 1 file changed, 13 insertions(+), 5 deletions(-)
Line 33... Line 33...
33   33  
34 --- a/wpa_supplicant/wpa_supplicant.c 34 --- a/wpa_supplicant/wpa_supplicant.c
35 +++ b/wpa_supplicant/wpa_supplicant.c 35 +++ b/wpa_supplicant/wpa_supplicant.c
36 @@ -2174,9 +2174,15 @@ void ibss_mesh_setup_freq(struct wpa_sup 36 @@ -2117,9 +2117,15 @@ void ibss_mesh_setup_freq(struct wpa_sup
37 if (!dfs_enabled) 37 if (!dfs_enabled)
Line 38... Line 38...
38 return; 38 return;
39 39
Line 49... Line 49...
49 + goto skip_ht40; 49 + goto skip_ht40;
50 + } 50 + }
51 #endif /* CONFIG_HT_OVERRIDES */ 51 #endif /* CONFIG_HT_OVERRIDES */
Line 52... Line 52...
52 52
53 /* Check/setup HT40+/HT40- */ 53 /* Check/setup HT40+/HT40- */
54 @@ -2204,8 +2210,6 @@ void ibss_mesh_setup_freq(struct wpa_sup 54 @@ -2147,8 +2153,6 @@ void ibss_mesh_setup_freq(struct wpa_sup
55 if (!dfs_enabled) 55 if (!dfs_enabled)
Line 56... Line 56...
56 return; 56 return;
57 57
58 - freq->channel = pri_chan->chan; 58 - freq->channel = pri_chan->chan;
59 - 59 -
60 if (ht40 == -1) { 60 if (ht40 == -1) {
61 if (!(pri_chan->flag & HOSTAPD_CHAN_HT40MINUS)) 61 if (!(pri_chan->flag & HOSTAPD_CHAN_HT40MINUS))
62 return; 62 return;
63 @@ -2249,6 +2253,7 @@ void ibss_mesh_setup_freq(struct wpa_sup 63 @@ -2192,6 +2196,7 @@ void ibss_mesh_setup_freq(struct wpa_sup
Line 64... Line 64...
64 wpa_scan_results_free(scan_res); 64 wpa_scan_results_free(scan_res);
65 } 65 }
66 66
67 +skip_ht40: 67 +skip_ht40:
68 wpa_printf(MSG_DEBUG, 68 wpa_printf(MSG_DEBUG,
69 "IBSS/mesh: setup freq channel %d, sec_channel_offset %d", 69 "IBSS/mesh: setup freq channel %d, sec_channel_offset %d",
70 freq->channel, freq->sec_channel_offset); 70 freq->channel, freq->sec_channel_offset);
71 @@ -2344,7 +2349,10 @@ void ibss_mesh_setup_freq(struct wpa_sup 71 @@ -2287,7 +2292,10 @@ void ibss_mesh_setup_freq(struct wpa_sup
72 } 72 }
73 } else if (ssid->max_oper_chwidth == VHT_CHANWIDTH_USE_HT) { 73 } else if (ssid->max_oper_chwidth == VHT_CHANWIDTH_USE_HT) {