From 417174ab7f3e2503994fe0ad8ae908bd66b697ea Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 13 Jul 2007 09:18:45 +0000 Subject: refresh madwifi patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7961 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/madwifi/patches/309-micfail_detect.patch | 52 ++++++++++++------------ 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'package/madwifi/patches/309-micfail_detect.patch') diff --git a/package/madwifi/patches/309-micfail_detect.patch b/package/madwifi/patches/309-micfail_detect.patch index b910282c63..2fa74cc027 100644 --- a/package/madwifi/patches/309-micfail_detect.patch +++ b/package/madwifi/patches/309-micfail_detect.patch @@ -1,8 +1,8 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-11 22:59:45.608447623 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-11 22:59:46.016470876 +0200 -@@ -5620,6 +5620,7 @@ +--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-13 11:18:21.021494493 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-13 11:18:21.297510222 +0200 +@@ -5630,6 +5630,7 @@ u_int64_t rs_tsf; u_int processed = 0, early_stop = 0; u_int rx_limit = dev->quota; @@ -10,7 +10,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c /* Let the 802.11 layer know about the new noise floor */ sc->sc_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan)); -@@ -5714,25 +5715,7 @@ +@@ -5724,25 +5725,7 @@ } if (rs->rs_status & HAL_RXERR_MIC) { sc->sc_stats.ast_rx_badmic++; @@ -37,7 +37,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c } /* * Reject error frames if we have no vaps that -@@ -5796,8 +5779,9 @@ +@@ -5807,8 +5790,9 @@ /* * Finished monitor mode handling, now reject * error frames before passing to other vaps @@ -48,7 +48,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c dev_kfree_skb(skb); skb = NULL; goto rx_next; -@@ -5828,6 +5812,27 @@ +@@ -5839,6 +5823,27 @@ sc->sc_hwmap[rs->rs_rate].ieeerate, rs->rs_rssi); @@ -78,8 +78,8 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c * pass the (referenced) node up to the 802.11 layer Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_ccmp.c 2007-07-11 22:59:43.580332047 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c 2007-07-11 22:59:46.020471102 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_ccmp.c 2007-07-13 11:18:18.465348826 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c 2007-07-13 11:18:21.297510222 +0200 @@ -73,7 +73,7 @@ static int ccmp_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int ccmp_decap(struct ieee80211_key *, struct sk_buff *, int); @@ -100,8 +100,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c } Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto.h 2007-07-11 22:59:37.880007204 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h 2007-07-11 22:59:46.060473383 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto.h 2007-07-13 11:18:12.749023072 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h 2007-07-13 11:18:21.317511359 +0200 @@ -145,7 +145,7 @@ int (*ic_encap)(struct ieee80211_key *, struct sk_buff *, u_int8_t); int (*ic_decap)(struct ieee80211_key *, struct sk_buff *, int); @@ -126,8 +126,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h /* Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_none.c 2007-07-11 22:59:37.888007663 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c 2007-07-11 22:59:46.084474751 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_none.c 2007-07-13 11:18:12.757023527 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c 2007-07-13 11:18:21.333512274 +0200 @@ -52,7 +52,7 @@ static int none_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int none_decap(struct ieee80211_key *, struct sk_buff *, int); @@ -148,8 +148,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_tkip.c 2007-07-11 22:59:37.896008115 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c 2007-07-11 22:59:46.112476346 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_tkip.c 2007-07-13 11:18:12.765023983 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c 2007-07-13 11:18:21.373514552 +0200 @@ -57,7 +57,7 @@ static int tkip_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int tkip_enmic(struct ieee80211_key *, struct sk_buff *, int); @@ -179,8 +179,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c u8 mic0[IEEE80211_WEP_MICLEN]; Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_wep.c 2007-07-11 22:59:37.900008344 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c 2007-07-11 22:59:46.136477715 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_wep.c 2007-07-13 11:18:12.769024209 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c 2007-07-13 11:18:21.393515692 +0200 @@ -54,7 +54,7 @@ static int wep_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int wep_decap(struct ieee80211_key *, struct sk_buff *, int); @@ -201,8 +201,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c } Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c 2007-07-11 22:59:45.608447623 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c 2007-07-11 22:59:46.180480221 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c 2007-07-13 11:18:20.621471697 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c 2007-07-13 11:18:21.417517061 +0200 @@ -632,7 +632,7 @@ * Next strip any MSDU crypto bits. */ @@ -262,8 +262,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c * Debugging support. Index: madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_proto.h 2007-07-11 22:59:37.916009256 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h 2007-07-11 22:59:46.204481592 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_proto.h 2007-07-13 11:18:12.785025121 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h 2007-07-13 11:18:21.441518427 +0200 @@ -91,6 +91,7 @@ void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode); enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *); @@ -274,8 +274,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h * Return the size of the 802.11 header for a management or data frame. Index: madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_linux.c 2007-07-11 22:59:43.336318141 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c 2007-07-11 22:59:46.228482956 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_linux.c 2007-07-13 11:18:18.229335376 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c 2007-07-13 11:18:21.485520935 +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, @@ -289,8 +289,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf); Index: madwifi-ng-r2568-20070710/net80211/ieee80211_output.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_output.c 2007-07-11 22:59:37.928009938 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_output.c 2007-07-11 22:59:46.252484325 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_output.c 2007-07-13 11:18:12.797025805 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_output.c 2007-07-13 11:18:21.509522302 +0200 @@ -1079,13 +1079,16 @@ cip = (struct ieee80211_cipher *) key->wk_cipher; ciphdrsize = cip->ic_header; @@ -313,8 +313,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_output.c * Allocate sk_buff for each subsequent fragment; First fragment Index: madwifi-ng-r2568-20070710/net80211/ieee80211_node.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.c 2007-07-11 22:59:45.632448994 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c 2007-07-11 22:59:46.304487289 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.c 2007-07-13 11:18:20.637472608 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c 2007-07-13 11:18:21.533523672 +0200 @@ -1891,11 +1891,13 @@ /* From this point onwards we can no longer find the node, * so no more references are generated -- cgit v1.2.3