Update hostapd to 0.6.4
SVN-Revision: 12298
This commit is contained in:
		@@ -9,14 +9,14 @@
 | 
				
			|||||||
include $(TOPDIR)/rules.mk
 | 
					include $(TOPDIR)/rules.mk
 | 
				
			||||||
 | 
					
 | 
				
			||||||
PKG_NAME:=hostapd
 | 
					PKG_NAME:=hostapd
 | 
				
			||||||
PKG_VERSION:=0.6.3
 | 
					PKG_VERSION:=0.6.4
 | 
				
			||||||
PKG_RELEASE:=1
 | 
					PKG_RELEASE:=1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 | 
					PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 | 
				
			||||||
PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 | 
					PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 | 
				
			||||||
PKG_SOURCE_SUBDIR:=hostapd-$(PKG_VERSION)
 | 
					PKG_SOURCE_SUBDIR:=hostapd-$(PKG_VERSION)
 | 
				
			||||||
PKG_SOURCE_VERSION:=$(PKG_REV)
 | 
					PKG_SOURCE_VERSION:=$(PKG_REV)
 | 
				
			||||||
PKG_MD5SUM:=516653e8d307bd6ec4ab33ba56962ed8
 | 
					PKG_MD5SUM:=62876f2179f316db0621cc33adf04c19
 | 
				
			||||||
PKG_BUILD_DEPENDS:=madwifi mac80211 libnl openssl
 | 
					PKG_BUILD_DEPENDS:=madwifi mac80211 libnl openssl
 | 
				
			||||||
 | 
					
 | 
				
			||||||
include $(INCLUDE_DIR)/package.mk
 | 
					include $(INCLUDE_DIR)/package.mk
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
@@ -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;
 | 
					 | 
				
			||||||
 }
 | 
					 | 
				
			||||||
		Reference in New Issue
	
	Block a user