From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 28 Feb 2006 20:09:56 +0000 (+0000)
Subject: update madwifi
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/22774bf94d280eab700515c44d9a5f2b48837a76

update madwifi

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

diff --git a/openwrt/target/linux/package/madwifi/Makefile b/openwrt/target/linux/package/madwifi/Makefile
index c19272692..03b40d415 100644
--- a/openwrt/target/linux/package/madwifi/Makefile
+++ b/openwrt/target/linux/package/madwifi/Makefile
@@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk
 include ../../rules.mk
 
 PKG_NAME:=madwifi-ng
-PKG_VERSION:=r1451-20060212
+PKG_VERSION:=r1456-20060225
 PKG_RELEASE:=1
-PKG_MD5SUM:=e3bef6881d711033689964bf0b982f14
+PKG_MD5SUM:=27ccc5ba2e463fd8bee6da74d717731d
 
 PKG_SOURCE_URL:=http://snapshots.madwifi.org/$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/openwrt/target/linux/package/madwifi/patches/103-wpa_crash.patch b/openwrt/target/linux/package/madwifi/patches/103-wpa_crash.patch
deleted file mode 100644
index e2ea7171f..000000000
--- a/openwrt/target/linux/package/madwifi/patches/103-wpa_crash.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ru madwifi-ng-r1451-20060212/net80211/ieee80211_ioctl.h madwifi-ng-r1451-20060212-patch/net80211/ieee80211_ioctl.h
---- madwifi-ng-r1451-20060212/net80211/ieee80211_ioctl.h	2006-02-06 11:03:21.000000000 -0500
-+++ madwifi-ng-r1451-20060212-patch/net80211/ieee80211_ioctl.h	2006-02-16 06:05:22.000000000 -0500
-@@ -280,6 +280,7 @@
- struct ieee80211req_wpaie {
- 	u_int8_t	wpa_macaddr[IEEE80211_ADDR_LEN];
- 	u_int8_t	wpa_ie[IEEE80211_MAX_OPT_IE];
-+	u_int8_t	rsn_ie[IEEE80211_MAX_OPT_IE];
- };
- 
- /*
-diff -ru madwifi-ng-r1451-20060212/net80211/ieee80211_wireless.c madwifi-ng-r1451-20060212-patch/net80211/ieee80211_wireless.c
---- madwifi-ng-r1451-20060212/net80211/ieee80211_wireless.c	2006-02-06 12:39:10.000000000 -0500
-+++ madwifi-ng-r1451-20060212-patch/net80211/ieee80211_wireless.c	2006-02-16 06:05:22.000000000 -0500
-@@ -3231,6 +3231,12 @@
- 			ielen = sizeof(wpaie.wpa_ie);
- 		memcpy(wpaie.wpa_ie, ni->ni_wpa_ie, ielen);
- 	}
-+	if (ni->ni_rsn_ie != NULL) {
-+		int ielen = ni->ni_rsn_ie[1] + 2;
-+		if (ielen > sizeof(wpaie.rsn_ie))
-+			ielen = sizeof(wpaie.rsn_ie);
-+		memcpy(wpaie.rsn_ie, ni->ni_rsn_ie, ielen);
-+	}
- 	ieee80211_free_node(ni);
- 	return (copy_to_user(iwr->u.data.pointer, &wpaie, sizeof(wpaie)) ?
- 		-EFAULT : 0);