On Mon, Mar 21, 2016 at 11:55:29AM -0600, Ahmed Zaki wrote:
> With the current HEAD (d4944fa), I am getting a build error while
> building wpa_supplicant with the defconfig and CONFIG_IBSS_RSN=y:
> ../src/ap/pmksa_cache_auth.o: In function `pmksa_cache_to_eapol_data':
> /home/ahmed/linux-git/hostap/wpa_supplicant/../src/ap/pmksa_cache_auth.c:217:
> undefined reference to `ap_sta_set_vlan'
It looks like this was broken recently with the hostapd VLAN changes.
The following modification to comment out this call should fix the
wpa_supplicant build with CONFIG_IBSS_RSN=y but without CONFIG_AP=y:
diff --git a/src/ap/pmksa_cache_auth.c b/src/ap/pmksa_cache_auth.c
index b419348..d610e7e 100644
--- a/src/ap/pmksa_cache_auth.c
+++ b/src/ap/pmksa_cache_auth.c
@@ -181,8 +181,6 @@ void pmksa_cache_to_eapol_data(struct hostapd_data *hapd,
struct rsn_pmksa_cache_entry *entry,
struct eapol_state_machine *eapol)
{
- struct sta_info *sta;
-
if (entry == NULL || eapol == NULL)
return;
@@ -213,8 +211,9 @@ void pmksa_cache_to_eapol_data(struct hostapd_data *hapd,
}
eapol->eap_type_authsrv = entry->eap_type_authsrv;
- sta = (struct sta_info *) eapol->sta;
- ap_sta_set_vlan(hapd, sta, entry->vlan_desc);
+#ifndef CONFIG_NO_VLAN
+ ap_sta_set_vlan(hapd, eapol->sta, entry->vlan_desc);
+#endif /* CONFIG_NO_VLAN */
eapol->acct_multi_session_id = entry->acct_multi_session_id;
}
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 93083f7..5f5a30a 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -312,6 +312,7 @@ endif
ifdef CONFIG_IBSS_RSN
NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_IBSS_RSN
+CFLAGS += -DCONFIG_NO_VLAN
OBJS += ibss_rsn.o
endif
--
Jouni Malinen PGP id EFC895FA
_______________________________________________
Hostap mailing list
Hostap@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/hostap
