DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

WNM: Use country code, if available, to help in channel mapping

Browse source 
The country code from the current AP needs to be used in
ieee80211_chan_to_freq() to support cases where non-global operating
class table is used.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-11-24 10:57:38 +02:00
parent 649c0a6974
commit 158211b2db
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
wpa_supplicant/wnm_sta.c
View file

@ -411,7 +411,17 @@ static void wnm_parse_neighbor_report_elem(struct neighbor_report *rep,
static int wnm_nei_get_chan(struct wpa_supplicant *wpa_s, u8 op_class, u8 chan) static int wnm_nei_get_chan(struct wpa_supplicant *wpa_s, u8 op_class, u8 chan)
{ {
return ieee80211_chan_to_freq(NULL, op_class, chan); struct wpa_bss *bss = wpa_s->current_bss;
const char *country = NULL;
if (bss) {
const u8 *elem = wpa_bss_get_ie(bss, WLAN_EID_COUNTRY);
if (elem && elem[1] >= 2)
country = (const char *) (elem + 2);
}
return ieee80211_chan_to_freq(country, op_class, chan);
} }