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

login
register
mail settings
Submitter Ben Greear
Date Nov. 16, 2011, 12:30 a.m.
Message ID <1321403404-32364-1-git-send-email-greearb@candelatech.com>
Download mbox | patch
Permalink /patch/125901/
State Accepted
Commit 300ab0556cea9dde9adb7928c4aa4ef5f29a90d3
Headers show

Comments

Ben Greear - Nov. 16, 2011, 12:30 a.m.
From: Ben Greear <greearb@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@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(-)
Jouni Malinen - Dec. 18, 2011, 7:16 p.m.
On Tue, Nov 15, 2011 at 04:30:04PM -0800, greearb@candelatech.com wrote:
> I needed this patch to compile against the latest
> libnl code.  I added this to my config file:
> 
> CONFIG_LIBNL32=y

Thanks, applied.
Xose Vazquez Perez - Dec. 12, 2013, 4:21 p.m.
On 11/16/2011 01:30 AM, greearb at candelatech.com wrote:

> 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

This is undocumented in hostapd/defconfig

Patch

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