From: Jouni Malinen Date: Mon, 7 Apr 2014 09:32:58 +0000 (+0300) Subject: Fix CONFIG_AP=y build without CONFIG_P2P=y X-Git-Tag: hostap_2_2~348 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8b10c17706c90131617eafe6f0617556e813356;p=thirdparty%2Fhostap.git Fix CONFIG_AP=y build without CONFIG_P2P=y Commit ca9bc5b5666a08c741ddd21c451ecb92aa33a11a used P2P functionality from ap.c without proper ifdef CONFIG_P2P. Signed-off-by: Jouni Malinen --- diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c index e7d59de99..b02c424fd 100644 --- a/wpa_supplicant/ap.c +++ b/wpa_supplicant/ap.c @@ -48,6 +48,7 @@ static void wpas_conf_ap_vht(struct wpa_supplicant *wpa_s, struct hostapd_config *conf, struct hostapd_hw_modes *mode) { +#ifdef CONFIG_P2P u8 center_chan = 0; u8 channel = conf->channel; @@ -66,6 +67,10 @@ static void wpas_conf_ap_vht(struct wpa_supplicant *wpa_s, no_vht: conf->vht_oper_centr_freq_seg0_idx = channel + conf->secondary_channel * 2; +#else /* CONFIG_P2P */ + conf->vht_oper_centr_freq_seg0_idx = + conf->channel + conf->secondary_channel * 2; +#endif /* CONFIG_P2P */ } #endif /* CONFIG_IEEE80211N */