Re: [PATCH] wpa_supplicant: fix compiling without IEEE8021X_EAPOL

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



I did not receive any feedback? This patch is now also upstream in OpenWrt.
It would be nice to not maintain so many downstream patches. Is something wrong with it?

Bests
Nick

On 3/14/23 22:17, Nick Hainke wrote:
If IEEE8021X_EAPOL is not defined wpa_supplicant will not compile with
following error:

   events.c: In function 'wpa_supplicant_connect':
   events.c:1827:14: warning: implicit declaration of function 'eap_is_wps_pbc_enrollee' [-Wimplicit-function-declaration]
    1827 |         if ((eap_is_wps_pbc_enrollee(&ssid->eap) &&
         |              ^~~~~~~~~~~~~~~~~~~~~~~
   events.c:1827:43: error: 'struct wpa_ssid' has no member named 'eap'
    1827 |         if ((eap_is_wps_pbc_enrollee(&ssid->eap) &&
         |                                           ^~

Adding ifdef statements around the calling function fixes the issue.

Signed-off-by: Nick Hainke <vincent@xxxxxxxxxxxx>
---
  wpa_supplicant/events.c | 2 ++
  1 file changed, 2 insertions(+)

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 8f0ed2033..3713c7bba 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -1824,6 +1824,7 @@ int wpa_supplicant_connect(struct wpa_supplicant *wpa_s,
  			   struct wpa_bss *selected,
  			   struct wpa_ssid *ssid)
  {
+#ifdef IEEE8021X_EAPOL
  	if ((eap_is_wps_pbc_enrollee(&ssid->eap) &&
  	     wpas_wps_partner_link_overlap_detect(wpa_s)) ||
  	    wpas_wps_scan_pbc_overlap(wpa_s, selected, ssid)) {
@@ -1846,6 +1847,7 @@ int wpa_supplicant_connect(struct wpa_supplicant *wpa_s,
  #endif /* CONFIG_WPS */
  		return -1;
  	}
+#endif /* IEEE8021X_EAPOL */
wpa_msg(wpa_s, MSG_DEBUG,
  		"Considering connect request: reassociate: %d  selected: "

_______________________________________________
Hostap mailing list
Hostap@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/hostap



[Index of Archives]     [Linux Wireless]     [Linux Kernel]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Device Mapper]

  Powered by Linux