From: Jouni Malinen <j@w1.fi>
Date: Thu, 4 Dec 2014 23:08:40 +0000 (+0200)
Subject: hostapd: Fix HT40 determination for ACS offload
X-Git-Tag: hostap_2_4~933
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5085ffb8f8e3863ad0f36d21e2946fc0b128c413;p=thirdparty%2Fhostap.git

hostapd: Fix HT40 determination for ACS offload

Commit 16689c7cfc99c66aecbf16eb2f4a8bc941cb5d0f ('hostapd: Allow ACS to
be offloaded to the driver') used incorrect operator to determine
whether HT40 was configured. Fix that to mask the ht_capab bit
correctly. (CID 77286)

Signed-off-by: Jouni Malinen <j@w1.fi>
---

diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index 9ebcf8f2e..7486fdaa0 100644
--- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c
@@ -804,7 +804,7 @@ int hostapd_drv_do_acs(struct hostapd_data *hapd)
 	os_memset(&params, 0, sizeof(params));
 	params.hw_mode = hapd->iface->conf->hw_mode;
 	params.ht_enabled = !!(hapd->iface->conf->ieee80211n);
-	params.ht40_enabled = !!(hapd->iface->conf->ht_capab |
+	params.ht40_enabled = !!(hapd->iface->conf->ht_capab &
 				 HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET);
 	return hapd->driver->do_acs(hapd->drv_priv, &params);
 }