From: Jouni Malinen Date: Wed, 6 Oct 2010 11:09:44 +0000 (+0300) Subject: Fix AP mode 40 MHz pri/sec channel parsing in overlap determination X-Git-Url: http://www.project-moonshot.org/gitweb/?p=libeap.git;a=commitdiff_plain;h=416192628d2b266fee8c9ce3f566b097c7225b4c Fix AP mode 40 MHz pri/sec channel parsing in overlap determination The previous implementation ended up incorrectly assuming that all 40 MHz use cases have secondary channel above the primary one. Fix this by properly masking the secondary channel offset field and checking its value. --- diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c index 0159c72..3bceb52 100644 --- a/src/ap/hw_features.c +++ b/src/ap/hw_features.c @@ -265,11 +265,11 @@ static void ieee80211n_get_pri_sec_chan(struct wpa_scan_res *bss, oper = (struct ieee80211_ht_operation *) elems.ht_operation; *pri_chan = oper->control_chan; if (oper->ht_param & HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH) { - if (oper->ht_param & - HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE) + int sec = oper->ht_param & + HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK; + if (sec == HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE) *sec_chan = *pri_chan + 4; - else if (oper->ht_param & - HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW) + else if (sec == HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW) *sec_chan = *pri_chan - 4; } }