[RFC] hostap: Allow linking with libnl-3.

greearb at candelatech.com greearb
Tue Nov 15 16:30:04 PST 2011


From: Ben Greear <greearb at candelatech.com>

I needed this patch to compile against the latest
libnl code.  I added this to my config file:

CONFIG_LIBNL32=y

Signed-hostap: Ben Greear <greearb at candelatech.com>
---
:100644 100644 5caeec5... 0cc81f9... M	src/drivers/drivers.mak
:100644 100644 30b332f... edf0aef... M	src/drivers/drivers.mk
 src/drivers/drivers.mak |   21 ++++++++++++++-------
 src/drivers/drivers.mk  |   22 +++++++++++++++-------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/drivers/drivers.mak b/src/drivers/drivers.mak
index 5caeec5..0cc81f9 100644
--- a/src/drivers/drivers.mak
+++ b/src/drivers/drivers.mak
@@ -26,15 +26,22 @@ NEED_AP_MLME=y
 NEED_NETLINK=y
 NEED_LINUX_IOCTL=y
 NEED_RFKILL=y
-ifdef CONFIG_LIBNL_TINY
-DRV_LIBS += -lnl-tiny
-else
-DRV_LIBS += -lnl
-endif
 
-ifdef CONFIG_LIBNL20
-DRV_LIBS += -lnl-genl
-DRV_CFLAGS += -DCONFIG_LIBNL20
+ifdef CONFIG_LIBNL32
+  DRV_LIBS += -lnl-3
+  DRV_LIBS += -lnl-genl-3
+  DRV_CFLAGS += -DCONFIG_LIBNL20
+else
+  ifdef CONFIG_LIBNL_TINY
+    DRV_LIBS += -lnl-tiny
+  else
+    DRV_LIBS += -lnl
+  endif
+
+  ifdef CONFIG_LIBNL20
+    DRV_LIBS += -lnl-genl
+    DRV_CFLAGS += -DCONFIG_LIBNL20
+  endif
 endif
 endif
 
diff --git a/src/drivers/drivers.mk b/src/drivers/drivers.mk
index 30b332f..edf0aef 100644
--- a/src/drivers/drivers.mk
+++ b/src/drivers/drivers.mk
@@ -26,16 +26,24 @@ NEED_AP_MLME=y
 NEED_NETLINK=y
 NEED_LINUX_IOCTL=y
 NEED_RFKILL=y
-ifdef CONFIG_LIBNL_TINY
-DRV_LIBS += -lnl-tiny
+
+ifdef CONFIG_LIBNL32
+  DRV_LIBS += -lnl-3
+  DRV_LIBS += -lnl-genl-3
+  DRV_CFLAGS += -DCONFIG_LIBNL20
 else
-DRV_LIBS += -lnl
-endif
+  ifdef CONFIG_LIBNL_TINY
+    DRV_LIBS += -lnl-tiny
+  else
+    DRV_LIBS += -lnl
+  endif
 
-ifdef CONFIG_LIBNL20
-DRV_LIBS += -lnl-genl
-DRV_CFLAGS += -DCONFIG_LIBNL20
+  ifdef CONFIG_LIBNL20
+    DRV_LIBS += -lnl-genl
+    DRV_CFLAGS += -DCONFIG_LIBNL20
+  endif
 endif
+
 endif
 
 ifdef CONFIG_DRIVER_BSD
-- 
1.7.3.4




More information about the Hostap mailing list