hostapd: update to latest git, remove openssl dependency for hostapd-full, it works with internal crypto now

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18360 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 22 insertions, 24 deletions

diff --git a/package/hostapd/patches/100-madwifi_fix.patch b/package/hostapd/patches/100-madwifi_fix.patch
index 8f8be442b9..915b86a641 100644
--- a/package/hostapd/patches/100-madwifi_fix.patch
+++ b/package/hostapd/patches/100-madwifi_fix.patch
@@ -1,6 +1,6 @@
---- a/hostapd/driver_madwifi.c
-+++ b/hostapd/driver_madwifi.c
-@@ -312,6 +312,7 @@ madwifi_set_iface_flags(void *priv, int 
+--- a/src/drivers/driver_madwifi.c
++++ b/src/drivers/driver_madwifi.c
+@@ -318,6 +318,7 @@ madwifi_set_iface_flags(void *priv, int 
  {
  	struct madwifi_driver_data *drv = priv;
  	struct ifreq ifr;
@@ -8,7 +8,7 @@
  
  	wpa_printf(MSG_DEBUG, "%s: dev_up=%d", __func__, dev_up);
  
-@@ -326,10 +327,14 @@ madwifi_set_iface_flags(void *priv, int 
+@@ -332,10 +333,14 @@ madwifi_set_iface_flags(void *priv, int 
  		return -1;
  	}
  
diff --git a/package/hostapd/patches/120-countrycode.patch b/package/hostapd/patches/110-countrycode.patch
index 8ffc65ca21..7c9d0219d9 100644
--- a/package/hostapd/patches/120-countrycode.patch
+++ b/package/hostapd/patches/110-countrycode.patch
@@ -1,6 +1,6 @@
 --- a/hostapd/hostapd.c
 +++ b/hostapd/hostapd.c
-@@ -1546,10 +1546,8 @@ static int setup_interface(struct hostap
+@@ -1344,10 +1344,8 @@ static int setup_interface(struct hostap
  	if (hapd->iconf->country[0] && hapd->iconf->country[1]) {
  		os_memcpy(country, hapd->iconf->country, 3);
  		country[3] = '\0';
@@ -11,4 +11,4 @@
 -		}
  	}
  
- 	if (hapd->iconf->ieee80211d &&
+ 	if (hapd->iconf->bridge_packets != INTERNAL_BRIDGE_DO_NOT_CONTROL &&
diff --git a/package/hostapd/patches/120-nl80211_ap_fix.patch b/package/hostapd/patches/120-nl80211_ap_fix.patch
new file mode 100644
index 0000000000..78475e87d5
--- /dev/null
+++ b/package/hostapd/patches/120-nl80211_ap_fix.patch
@@ -0,0 +1,16 @@
+--- a/src/drivers/driver_nl80211.c
++++ b/src/drivers/driver_nl80211.c
+@@ -4418,10 +4418,10 @@ static void *i802_init(struct hostapd_da
+ 	/* start listening for EAPOL on the default AP interface */
+ 	add_ifidx(drv, drv->ifindex);
+ 
+-	if (params->bssid) {
+-		if (hostapd_set_iface_flags(drv, drv->ifname, 0))
+-			goto failed;
++	if (hostapd_set_iface_flags(drv, drv->ifname, 0))
++		goto failed;
+ 
++	if (params->bssid) {
+ 		if (set_ifhwaddr(drv, drv->ifname, params->bssid))
+ 			goto failed;
+ 	}
diff --git a/package/hostapd/patches/130-libnl_update.patch b/package/hostapd/patches/130-libnl_update.patch
deleted file mode 100644
index 51bc58a08a..0000000000
--- a/package/hostapd/patches/130-libnl_update.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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 {