Update hostapd to 0.6.4

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

3 files changed, 2 insertions, 68 deletions

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index b5e69d41ec..e9d8a5c2cc 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -9,14 +9,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd
-PKG_VERSION:=0.6.3
+PKG_VERSION:=0.6.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_SOURCE_SUBDIR:=hostapd-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_MD5SUM:=516653e8d307bd6ec4ab33ba56962ed8
+PKG_MD5SUM:=62876f2179f316db0621cc33adf04c19
 PKG_BUILD_DEPENDS:=madwifi mac80211 libnl openssl
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/hostapd/patches/001-include_wireless_copy.patch b/package/hostapd/patches/001-include_wireless_copy.patch
deleted file mode 100644
index 1fa6d28091..0000000000
--- a/package/hostapd/patches/001-include_wireless_copy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur hostapd/driver_nl80211.c hostapd.new/driver_nl80211.c
---- hostapd/hostapd/driver_nl80211.c    2008-02-23 03:45:24.000000000 +0100
-+++ hostapd.new/hostapd/driver_nl80211.c        2008-06-28 12:46:56.000000000 +0200
-@@ -27,7 +27,7 @@
- #include <net/if.h>
- #include <linux/if_packet.h>
- #include <linux/if_ether.h>   /* The L2 protocols */
--#include <linux/wireless.h>
-+#include "wireless_copy.h"
- #include <net/if_arp.h>
- 
- #include "hostapd.h"
-
diff --git a/package/hostapd/patches/004-nl80211-rename-STAT-to-INFO.patch b/package/hostapd/patches/004-nl80211-rename-STAT-to-INFO.patch
deleted file mode 100644
index 3cc80f9767..0000000000
--- a/package/hostapd/patches/004-nl80211-rename-STAT-to-INFO.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/hostapd/driver_nl80211.c
-+++ b/hostapd/driver_nl80211.c
-@@ -598,11 +598,11 @@
- 	struct nlattr *tb[NL80211_ATTR_MAX + 1];
- 	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
- 	struct hostap_sta_driver_data *data = arg;
--	struct nlattr *stats[NL80211_STA_STAT_MAX + 1];
--	static struct nla_policy stats_policy[NL80211_STA_STAT_MAX + 1] = {
--		[NL80211_STA_STAT_INACTIVE_TIME] = { .type = NLA_U32 },
--		[NL80211_STA_STAT_RX_BYTES] = { .type = NLA_U32 },
--		[NL80211_STA_STAT_TX_BYTES] = { .type = NLA_U32 },
-+	struct nlattr *stats[NL80211_STA_INFO_MAX + 1];
-+	static struct nla_policy stats_policy[NL80211_STA_INFO_MAX + 1] = {
-+		[NL80211_STA_INFO_INACTIVE_TIME] = { .type = NLA_U32 },
-+		[NL80211_STA_INFO_RX_BYTES] = { .type = NLA_U32 },
-+		[NL80211_STA_INFO_TX_BYTES] = { .type = NLA_U32 },
- 	};
- 
- 	nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
-@@ -614,24 +614,24 @@
- 	 * the kernel starts sending station notifications.
- 	 */
- 
--	if (!tb[NL80211_ATTR_STA_STATS]) {
-+	if (!tb[NL80211_ATTR_STA_INFO]) {
- 		wpa_printf(MSG_DEBUG, "sta stats missing!");
- 		return NL_SKIP;
- 	}
--	if (nla_parse_nested(stats, NL80211_STA_STAT_MAX,
--			     tb[NL80211_ATTR_STA_STATS],
-+	if (nla_parse_nested(stats, NL80211_STA_INFO_MAX,
-+			     tb[NL80211_ATTR_STA_INFO],
- 			     stats_policy)) {
- 		wpa_printf(MSG_DEBUG, "failed to parse nested attributes!");
- 		return NL_SKIP;
- 	}
- 
--	if (stats[NL80211_STA_STAT_INACTIVE_TIME])
-+	if (stats[NL80211_STA_INFO_INACTIVE_TIME])
- 		data->inactive_msec =
--			nla_get_u32(stats[NL80211_STA_STAT_INACTIVE_TIME]);
--	if (stats[NL80211_STA_STAT_RX_BYTES])
--		data->rx_bytes = nla_get_u32(stats[NL80211_STA_STAT_RX_BYTES]);
--	if (stats[NL80211_STA_STAT_TX_BYTES])
--		data->rx_bytes = nla_get_u32(stats[NL80211_STA_STAT_TX_BYTES]);
-+			nla_get_u32(stats[NL80211_STA_INFO_INACTIVE_TIME]);
-+	if (stats[NL80211_STA_INFO_RX_BYTES])
-+		data->rx_bytes = nla_get_u32(stats[NL80211_STA_INFO_RX_BYTES]);
-+	if (stats[NL80211_STA_INFO_TX_BYTES])
-+		data->rx_bytes = nla_get_u32(stats[NL80211_STA_INFO_TX_BYTES]);
- 
- 	return NL_SKIP;
- }