Browse Source

Allow wpa_supplicant to use libnl-2.0

Change existing CONFIG_LIBNL20 compatibility code in
driver_nl80211.c to be used by both wpa_supplicant
and hostapd, but take care of nl_handle too now.

Propagate CONFIG_LIBNL20 out of .config file and onto
CFLAGS in the Makefile.

Use libnl-gen now too.

Signed-off-by: Jon Loeliger <jdl@bigfootnetworks.com>
---
Jon Loeliger 15 years ago
parent
commit
2e8eac2d67
2 changed files with 6 additions and 2 deletions
  1. 2 2
      src/drivers/driver_nl80211.c
  2. 4 0
      wpa_supplicant/Makefile

+ 2 - 2
src/drivers/driver_nl80211.c

@@ -45,15 +45,15 @@
 
 #ifdef HOSTAPD
 #include "ieee802_11_common.h"
+#endif /* HOSTAPD */
 
 #ifdef CONFIG_LIBNL20
 /* libnl 2.0 compatibility code */
+#define nl_handle nl_sock
 #define nl_handle_alloc_cb nl_socket_alloc_cb
 #define nl_handle_destroy nl_socket_free
 #endif /* CONFIG_LIBNL20 */
 
-#endif /* HOSTAPD */
-
 
 #ifndef IFF_LOWER_UP
 #define IFF_LOWER_UP   0x10000         /* driver signals L1 up         */

+ 4 - 0
wpa_supplicant/Makefile

@@ -135,6 +135,10 @@ ifdef CONFIG_DRIVER_NL80211
 CFLAGS += -DCONFIG_DRIVER_NL80211
 OBJS_d += ../src/drivers/driver_nl80211.o
 LIBS += -lnl
+ifdef CONFIG_LIBNL20
+LIBS += -lnl-genl
+CFLAGS += -DCONFIG_LIBNL20
+endif
 ifdef CONFIG_CLIENT_MLME
 OBJS_d += ../src/utils/radiotap.o
 endif