jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wpa_supplicant: Fix CONFIG_IBSS_RSN=y build without CONFIG_AP=y

Browse source 
Commit 1889af2e0f ('VLAN: Separate station
grouping and uplink configuration') added an ap_sta_set_vlan() function
that gets called from pmksa_cache_auth.c. This broke CONFIG_IBSS_RSN=y
build if src/ap/sta_info.c did not get included in the build, i.e., if
CONFIG_AP=y was not set.

Fix this by making the ap_sta_set_vlan() call conditional on
CONFIG_NO_VLAN being undefined and define this for CONFIG_IBSS_RSN=y
builds. This is fine for wpa_supplicant since CONFIG_AP=y case was
already defining this. For hostapd, this function call is not needed for
CONFIG_NO_VLAN case either.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2016-03-21 21:09:03 +02:00 committed by Jouni Malinen
parent 71666dc33a
commit 90377029c6
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ap/pmksa_cache_auth.c
View file

@ -181,8 +181,6 @@ void pmksa_cache_to_eapol_data(struct hostapd_data *hapd,
struct rsn_pmksa_cache_entry *entry, struct rsn_pmksa_cache_entry *entry,
struct eapol_state_machine *eapol) struct eapol_state_machine *eapol)
{ {
struct sta_info *sta;
if (entry == NULL || eapol == NULL) if (entry == NULL || eapol == NULL)
return; return;
@ -213,8 +211,9 @@ void pmksa_cache_to_eapol_data(struct hostapd_data *hapd,
} }
eapol->eap_type_authsrv = entry->eap_type_authsrv; eapol->eap_type_authsrv = entry->eap_type_authsrv;
sta = (struct sta_info *) eapol->sta; #ifndef CONFIG_NO_VLAN
ap_sta_set_vlan(hapd, sta, entry->vlan_desc); ap_sta_set_vlan(hapd, eapol->sta, entry->vlan_desc);
#endif /* CONFIG_NO_VLAN */
eapol->acct_multi_session_id = entry->acct_multi_session_id; eapol->acct_multi_session_id = entry->acct_multi_session_id;
} }

1
wpa_supplicant/Android.mk
View file

@ -269,6 +269,7 @@ endif
ifdef CONFIG_IBSS_RSN ifdef CONFIG_IBSS_RSN
NEED_RSN_AUTHENTICATOR=y NEED_RSN_AUTHENTICATOR=y
L_CFLAGS += -DCONFIG_IBSS_RSN L_CFLAGS += -DCONFIG_IBSS_RSN
L_CFLAGS += -DCONFIG_NO_VLAN
OBJS += ibss_rsn.c OBJS += ibss_rsn.c
endif endif

1
wpa_supplicant/Makefile
View file

@ -312,6 +312,7 @@ endif
ifdef CONFIG_IBSS_RSN ifdef CONFIG_IBSS_RSN
NEED_RSN_AUTHENTICATOR=y NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_IBSS_RSN CFLAGS += -DCONFIG_IBSS_RSN
CFLAGS += -DCONFIG_NO_VLAN
OBJS += ibss_rsn.o OBJS += ibss_rsn.o
endif endif