mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

madwifi update: include upstream fixes for ff handling, disable ff by default (not reliable enough), wpa in ap mode should be working now

Browse Source 
SVN-Revision: 7440
This commit is contained in:
Felix Fietkau 2007-06-02 02:22:01 +00:00
parent e19eb3d828
commit 47ecff5cf8
6 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/madwifi/Makefile
View File

@ -10,14 +10,14 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=madwifi
PKG_VERSION:=r2414-20070601
PKG_VERSION:=r2420-20070602
PKG_BRANCH:=madwifi-ng
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_BRANCH)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://snapshots.madwifi.org/$(PKG_BRANCH)
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_BRANCH)-$(PKG_VERSION)
PKG_MD5SUM:=a6d1c884520cccf8ef407b4d0a00de72
PKG_MD5SUM:=1ba88326b8dc8c231562329fc2e39578
include $(INCLUDE_DIR)/package.mk

5
package/madwifi/files/lib/wifi/madwifi.sh
View File

@ -109,9 +109,12 @@ enable_atheros() {
iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null
}
config_get_bool hidden "$vif" hidden
config_get_bool hidden "$vif" hidden 0
iwpriv "$ifname" hide_ssid "$hidden"
config_get_bool ff "$vif" ff 0
iwpriv "$ifname" ff "$ff"
config_get wds "$vif" wds
case "$wds" in
1|on|enabled) wds=1;;

11
package/madwifi/patches/114-ff_skb_fix.patch
View File

@ -1,11 +0,0 @@
diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_input.c
--- madwifi.old/net80211/ieee80211_input.c 2007-06-01 16:44:25.174897520 +0200
+++ madwifi.dev/net80211/ieee80211_input.c 2007-06-01 17:43:52.153634328 +0200
@@ -685,6 +685,7 @@
IEEE80211_NODE_STAT(ni, rx_decap);
goto err;
}
+ skb1 = skb_clone(skb, GFP_ATOMIC);
/* get to the tunneled headers */
ath_hdr = (struct athl2p_tunnel_hdr *)

19
package/madwifi/patches/121-ibss_hostap.patch
View File

@ -112,16 +112,15 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
sc->sc_nstavaps--;
sc->sc_nostabeacons = 0;
} else if (vap->iv_opmode == IEEE80211_M_MONITOR)
@@ -3356,7 +3347,8 @@
HAL_RX_FILTER_MCAST;
if (ic->ic_opmode != IEEE80211_M_STA)
rfilt |= HAL_RX_FILTER_PROBEREQ;
- if (ic->ic_opmode != IEEE80211_M_HOSTAP && (dev->flags & IFF_PROMISC))
+ if ((ic->ic_opmode != IEEE80211_M_HOSTAP && (dev->flags & IFF_PROMISC)) ||
+ ((sc->sc_nvaps > 0) && (sc->sc_nibssvaps > 0)))
rfilt |= HAL_RX_FILTER_PROM;
if (ic->ic_opmode == IEEE80211_M_STA ||
sc->sc_opmode == HAL_M_IBSS || /* NB: AHDEMO too */
@@ -3368,7 +3367,7 @@
((ic->ic_opmode == IEEE80211_M_HOSTAP) &&
(ic->ic_protmode != IEEE80211_PROT_NONE)))
rfilt |= HAL_RX_FILTER_BEACON;
- if (sc->sc_nmonvaps > 0)
+ if ((sc->sc_nmonvaps > 0) || ((sc->sc_nvaps > 0) && (sc->sc_nibssvaps > 0)))
rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
HAL_RX_FILTER_PROBEREQ | HAL_RX_FILTER_PROM);
return rfilt;
@@ -5809,12 +5801,19 @@
type = ieee80211_input(ni, skb, rs->rs_rssi, rs->rs_tstamp);
ieee80211_unref_node(&ni);

13
package/madwifi/patches/122-replayfail_workaround.patch Normal file
View File

@ -0,0 +1,13 @@
diff -ur madwifi.old/net80211/ieee80211_linux.c madwifi.dev/net80211/ieee80211_linux.c
--- madwifi.old/net80211/ieee80211_linux.c 2007-05-30 03:41:18.000000000 +0200
+++ madwifi.dev/net80211/ieee80211_linux.c 2007-06-02 01:43:40.818092096 +0200
@@ -285,6 +285,9 @@
k->wk_cipher->ic_name, k->wk_keyix,
(unsigned long long)rsc );
+ /* disabled for now due to bogus events for unknown reasons */
+ return;
+
/* TODO: needed parameters: count, keyid, key type, src address, TSC */
snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag,
k->wk_keyix,

27
package/madwifi/patches/309-micfail_detect.patch
View File

@ -246,20 +246,6 @@ diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_i
#ifdef IEEE80211_DEBUG
/*
* Debugging support.
diff -ur madwifi.old/net80211/ieee80211_linux.c madwifi.dev/net80211/ieee80211_linux.c
--- madwifi.old/net80211/ieee80211_linux.c 2007-05-30 03:41:18.000000000 +0200
+++ madwifi.dev/net80211/ieee80211_linux.c 2007-06-01 11:45:05.003258624 +0200
@@ -311,8 +311,8 @@
/* TODO: needed parameters: count, keyid, key type, src address, TSC */
snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag,
- keyix, IEEE80211_IS_MULTICAST(wh->i_addr1) ? "broad" : "uni",
- ether_sprintf(wh->i_addr1));
+ keyix, IEEE80211_IS_MULTICAST(wh->i_addr2) ? "broad" : "uni",
+ ether_sprintf(wh->i_addr2));
memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.length = strlen(buf);
wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
diff -ur madwifi.old/net80211/ieee80211_proto.h madwifi.dev/net80211/ieee80211_proto.h
--- madwifi.old/net80211/ieee80211_proto.h 2007-06-01 11:26:04.172691000 +0200
+++ madwifi.dev/net80211/ieee80211_proto.h 2007-06-01 11:45:05.004258472 +0200
@ -271,3 +257,16 @@ diff -ur madwifi.old/net80211/ieee80211_proto.h madwifi.dev/net80211/ieee80211_p
/*
* Return the size of the 802.11 header for a management or data frame.
--- madwifi.old/net80211/ieee80211_linux.c 2007-06-02 04:05:42.902538336 +0200
+++ madwifi.dev/net80211/ieee80211_linux.c 2007-06-02 04:05:55.302653232 +0200
@@ -291,8 +291,8 @@
/* TODO: needed parameters: count, keyid, key type, src address, TSC */
snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag,
k->wk_keyix,
- IEEE80211_IS_MULTICAST(wh->i_addr1) ? "broad" : "uni",
- ether_sprintf(wh->i_addr1));
+ IEEE80211_IS_MULTICAST(wh->i_addr2) ? "broad" : "uni",
+ ether_sprintf(wh->i_addr2));
memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.length = strlen(buf);
wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);