[PATCH] mesh: Set correct secondary channel offset if HT40 is disabled

[Jouni Malinen]

On Tue, Jul 26, 2016 at 11:45:40AM +0900, Masashi Honma wrote:
> Previously, secondary channel offset could be non zero even though
> disable_ht40=1. This patch fixes it.

> diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
> @@ -1907,20 +1907,27 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,

> +#ifdef CONFIG_HT_OVERRIDES
> +	if (ssid->disable_ht40)
> +		ht40 = 0;
> +#endif /* CONFIG_HT_OVERRIDES */

Why would this not simply return here on disable_ht40? The way the
following changes are done would seem to imply that the previous if
!sec_chan return case is skipped and execution continues to set up VHT
parameters. This could then end up trying to claim that VHT is enabled
on a 80 MHz channel which should not really happen if HT40 is not
allowed.

-- 
Jouni Malinen                                            PGP id EFC895FA