[PATCH 21/26] wpa_supplicant: Add support for channels 165 and 169

[Jouni Malinen]

On Tue, Sep 08, 2015 at 12:46:28PM +0300, Ilan Peer wrote:
> Channels 165 and 169 are part of operating class 125. Add support
> for these channels.

> diff --git a/src/common/ieee802_11_common.c b/src/common/ieee802_11_common.c
> @@ -928,7 +928,7 @@ static int ieee80211_chan_to_freq_global(u8 op_class, u8 chan)
>  	case 124: /* channels 149,153,157,161 */
>  	case 126: /* channels 149,157; 40 MHz */
>  	case 127: /* channels 153,161; 40 MHz */
> -		if (chan < 149 || chan > 161)
> +		if (chan < 149 || chan > 169)
>  			return -1;
>  		return 5000 + 5 * chan;
>  	case 125: /* channels 149,153,157,161,165,169 */

This does not look correct. Operating class 125 is already covered by
the case starting at the end of the context here.. I'm dropping this
part of the patch since none of those operating classes 124, 126, or 127
is supposed to include channels 165 or 169.

> diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
> index 9059da5..a2e32cb 100644
> --- a/wpa_supplicant/p2p_supplicant.c
> +++ b/wpa_supplicant/p2p_supplicant.c
> @@ -3265,6 +3265,7 @@ static const struct p2p_oper_class_map op_class[] = {
>  	{ HOSTAPD_MODE_IEEE80211A, 125, 149, 169, 4, BW20 },
>  	{ HOSTAPD_MODE_IEEE80211A, 116, 36, 44, 8, BW40PLUS },
>  	{ HOSTAPD_MODE_IEEE80211A, 117, 40, 48, 8, BW40MINUS },
> +	{ HOSTAPD_MODE_IEEE80211A, 125, 149, 169, 4, BW20 },

And this is duplicating a line just couple of lines above..

These were added by an earlier contribution from Intel ('P2P: Add
Operating class 125 for P2P supported channels'). I'm assuming this was
some kind of merge resolution error, etc., and drop the patch 21 from
this series.
 
-- 
Jouni Malinen                                            PGP id EFC895FA