From b4c8460d0724dcfc95df20c2da8350a0b12d66c7 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 30 Apr 2009 18:11:01 +0000
Subject: [PATCH] hostapd: use libnl-tiny instead of libnl

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15519 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/hostapd/Makefile                       | 14 ++++++++++----
 package/hostapd/patches/130-libnl_update.patch | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 package/hostapd/patches/130-libnl_update.patch

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 0c1d6fc77..bd873b9b2 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -20,7 +20,6 @@ PKG_MD5SUM:=83630d11fa66ade9091f1b304fccd74c
 PKG_BUILD_DEPENDS:= \
 	PACKAGE_kmod-madwifi:madwifi \
 	PACKAGE_kmod-mac80211:mac80211 \
-	PACKAGE_kmod-mac80211:libnl \
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_kmod-ath9k \
@@ -41,7 +40,7 @@ define Package/hostapd/Default
   CATEGORY:=Network
   TITLE:=IEEE 802.1x Authenticator
   URL:=http://hostap.epitest.fi/
-  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax
+  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +PACKAGE_kmod-mac80211:libnl-tiny
 endef
 
 define Package/hostapd
@@ -94,13 +93,20 @@ define Build/ConfigureTarget
 	$(CP) ./files/$(1).config $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd/.config
 endef
 
+TARGET_CPPFLAGS := \
+	-I$(STAGING_DIR)/usr/include/libnl-tiny \
+	$(TARGET_CPPFLAGS) \
+	-I$(STAGING_DIR)/usr/include/madwifi \
+	-I$(STAGING_DIR)/usr/include/mac80211 \
+	-DCONFIG_LIBNL20
+
 define Build/CompileTarget
-	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/madwifi -I$(STAGING_DIR)/usr/include/mac80211 -I$(STAGING_DIR)/usr/include/libnl $(TARGET_CPPFLAGS)" \
+	CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
 	$(MAKE) -C $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(DRIVER_MAKEOPTS) \
 		LIBS="$(TARGET_LDFLAGS) \
-			$(if $(CONFIG_PACKAGE_kmod-mac80211),-lm $(STAGING_DIR)/usr/lib/libnl.a) \
+			$(if $(CONFIG_PACKAGE_kmod-mac80211),-lm -lnl-tiny) \
 			$(if $(findstring default,$(1)),-lssl -lcrypto)" \
 		hostapd hostapd_cli
 	$(CP) $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd/hostapd_cli $(PKG_BUILD_DIR)/
diff --git a/package/hostapd/patches/130-libnl_update.patch b/package/hostapd/patches/130-libnl_update.patch
new file mode 100644
index 000000000..51bc58a08
--- /dev/null
+++ b/package/hostapd/patches/130-libnl_update.patch
@@ -0,0 +1,18 @@
+--- a/hostapd/driver_nl80211.c
++++ b/hostapd/driver_nl80211.c
+@@ -29,6 +29,7 @@
+ #include "wireless_copy.h"
+ #include <linux/filter.h>
+ #include <net/if_arp.h>
++#include <linux/rtnetlink.h>
+ 
+ #include "hostapd.h"
+ #include "driver.h"
+@@ -45,6 +46,7 @@
+ /* libnl 2.0 compatibility code */
+ #define nl_handle_alloc_cb nl_socket_alloc_cb
+ #define nl_handle_destroy nl_socket_free
++#define nl_handle nl_sock
+ #endif /* CONFIG_LIBNL20 */
+ 
+ enum ieee80211_msg_type {
-- 
2.20.1