From b3378a4f120657d96db891ce19ed6533f99d1f94 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 28 Jan 2008 18:34:06 +0000 Subject: update madwifi to latest trunk, include a few more fixes/improvements git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10294 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/madwifi/patches/309-micfail_detect.patch | 86 ++++++++++++------------ 1 file changed, 43 insertions(+), 43 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 c1b6224425..1b4cf3b261 100644 --- a/package/madwifi/patches/309-micfail_detect.patch +++ b/package/madwifi/patches/309-micfail_detect.patch @@ -1,16 +1,16 @@ -Index: madwifi-dfs-r3246/ath/if_ath.c +Index: madwifi-dfs-r3280/ath/if_ath.c =================================================================== ---- madwifi-dfs-r3246.orig/ath/if_ath.c 2008-01-25 16:33:11.528293596 +0100 -+++ madwifi-dfs-r3246/ath/if_ath.c 2008-01-25 16:36:40.024175098 +0100 -@@ -6393,6 +6393,7 @@ +--- madwifi-dfs-r3280.orig/ath/if_ath.c 2008-01-28 17:14:55.182157045 +0100 ++++ madwifi-dfs-r3280/ath/if_ath.c 2008-01-28 17:15:04.876271620 +0100 +@@ -6379,6 +6379,7 @@ u_int phyerr; u_int processed = 0, early_stop = 0; u_int rx_limit = dev->quota; + u_int mic_fail = 0; - DPRINTF(sc, ATH_DEBUG_RX_PROC, "%s\n", __func__); + DPRINTF(sc, ATH_DEBUG_RX_PROC, "invoked\n"); process_rx_again: -@@ -6492,24 +6493,8 @@ +@@ -6478,24 +6479,8 @@ } if (rs->rs_status & HAL_RXERR_MIC) { sc->sc_stats.ast_rx_badmic++; @@ -37,7 +37,7 @@ Index: madwifi-dfs-r3246/ath/if_ath.c } /* * Reject error frames if we have no vaps that -@@ -6562,8 +6547,9 @@ +@@ -6534,8 +6519,9 @@ /* * Finished monitor mode handling, now reject * error frames before passing to other vaps @@ -48,7 +48,7 @@ Index: madwifi-dfs-r3246/ath/if_ath.c ieee80211_dev_kfree_skb(&skb); goto rx_next; } -@@ -6571,6 +6557,26 @@ +@@ -6543,6 +6529,26 @@ /* remove the CRC */ skb_trim(skb, skb->len - IEEE80211_CRC_LEN); @@ -75,7 +75,7 @@ Index: madwifi-dfs-r3246/ath/if_ath.c /* * From this point on we assume the frame is at least * as large as ieee80211_frame_min; verify that. -@@ -6583,6 +6589,7 @@ +@@ -6555,6 +6561,7 @@ goto rx_next; } @@ -83,10 +83,10 @@ Index: madwifi-dfs-r3246/ath/if_ath.c /* * Normal receive. */ -Index: madwifi-dfs-r3246/net80211/ieee80211_crypto_ccmp.c +Index: madwifi-dfs-r3280/net80211/ieee80211_crypto_ccmp.c =================================================================== ---- madwifi-dfs-r3246.orig/net80211/ieee80211_crypto_ccmp.c 2008-01-25 16:28:31.292323859 +0100 -+++ madwifi-dfs-r3246/net80211/ieee80211_crypto_ccmp.c 2008-01-25 16:36:01.926004007 +0100 +--- madwifi-dfs-r3280.orig/net80211/ieee80211_crypto_ccmp.c 2008-01-28 17:14:16.203935804 +0100 ++++ madwifi-dfs-r3280/net80211/ieee80211_crypto_ccmp.c 2008-01-28 17:15:04.916253895 +0100 @@ -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); @@ -105,10 +105,10 @@ Index: madwifi-dfs-r3246/net80211/ieee80211_crypto_ccmp.c { return 1; } -Index: madwifi-dfs-r3246/net80211/ieee80211_crypto.h +Index: madwifi-dfs-r3280/net80211/ieee80211_crypto.h =================================================================== ---- madwifi-dfs-r3246.orig/net80211/ieee80211_crypto.h 2008-01-25 16:27:28.000000000 +0100 -+++ madwifi-dfs-r3246/net80211/ieee80211_crypto.h 2008-01-25 16:36:01.926004007 +0100 +--- madwifi-dfs-r3280.orig/net80211/ieee80211_crypto.h 2008-01-28 17:13:49.000000000 +0100 ++++ madwifi-dfs-r3280/net80211/ieee80211_crypto.h 2008-01-28 17:15:05.116165297 +0100 @@ -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); @@ -131,10 +131,10 @@ Index: madwifi-dfs-r3246/net80211/ieee80211_crypto.h } /* -Index: madwifi-dfs-r3246/net80211/ieee80211_crypto_none.c +Index: madwifi-dfs-r3280/net80211/ieee80211_crypto_none.c =================================================================== ---- madwifi-dfs-r3246.orig/net80211/ieee80211_crypto_none.c 2008-01-25 16:27:28.000000000 +0100 -+++ madwifi-dfs-r3246/net80211/ieee80211_crypto_none.c 2008-01-25 16:36:01.926004007 +0100 +--- madwifi-dfs-r3280.orig/net80211/ieee80211_crypto_none.c 2008-01-28 17:13:49.000000000 +0100 ++++ madwifi-dfs-r3280/net80211/ieee80211_crypto_none.c 2008-01-28 17:15:05.316076693 +0100 @@ -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); @@ -153,10 +153,10 @@ Index: madwifi-dfs-r3246/net80211/ieee80211_crypto_none.c { struct ieee80211vap *vap = k->wk_private; -Index: madwifi-dfs-r3246/net80211/ieee80211_crypto_tkip.c +Index: madwifi-dfs-r3280/net80211/ieee80211_crypto_tkip.c =================================================================== ---- madwifi-dfs-r3246.orig/net80211/ieee80211_crypto_tkip.c 2008-01-25 16:27:28.000000000 +0100 -+++ madwifi-dfs-r3246/net80211/ieee80211_crypto_tkip.c 2008-01-25 16:36:01.930004236 +0100 +--- madwifi-dfs-r3280.orig/net80211/ieee80211_crypto_tkip.c 2008-01-28 17:13:49.000000000 +0100 ++++ madwifi-dfs-r3280/net80211/ieee80211_crypto_tkip.c 2008-01-28 17:15:05.519986320 +0100 @@ -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); @@ -184,10 +184,10 @@ Index: madwifi-dfs-r3246/net80211/ieee80211_crypto_tkip.c struct ieee80211vap *vap = ctx->tc_vap; u8 mic[IEEE80211_WEP_MICLEN]; u8 mic0[IEEE80211_WEP_MICLEN]; -Index: madwifi-dfs-r3246/net80211/ieee80211_crypto_wep.c +Index: madwifi-dfs-r3280/net80211/ieee80211_crypto_wep.c =================================================================== ---- madwifi-dfs-r3246.orig/net80211/ieee80211_crypto_wep.c 2008-01-25 16:27:28.000000000 +0100 -+++ madwifi-dfs-r3246/net80211/ieee80211_crypto_wep.c 2008-01-25 16:36:01.930004236 +0100 +--- madwifi-dfs-r3280.orig/net80211/ieee80211_crypto_wep.c 2008-01-28 17:13:49.000000000 +0100 ++++ madwifi-dfs-r3280/net80211/ieee80211_crypto_wep.c 2008-01-28 17:15:05.731892402 +0100 @@ -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); @@ -206,10 +206,10 @@ Index: madwifi-dfs-r3246/net80211/ieee80211_crypto_wep.c { return 1; } -Index: madwifi-dfs-r3246/net80211/ieee80211_input.c +Index: madwifi-dfs-r3280/net80211/ieee80211_input.c =================================================================== ---- madwifi-dfs-r3246.orig/net80211/ieee80211_input.c 2008-01-25 16:35:46.341115878 +0100 -+++ madwifi-dfs-r3246/net80211/ieee80211_input.c 2008-01-25 16:36:01.934004465 +0100 +--- madwifi-dfs-r3280.orig/net80211/ieee80211_input.c 2008-01-28 17:14:55.186157275 +0100 ++++ madwifi-dfs-r3280/net80211/ieee80211_input.c 2008-01-28 17:15:05.831848102 +0100 @@ -669,7 +669,7 @@ * Next strip any MSDU crypto bits. */ @@ -219,7 +219,7 @@ Index: madwifi-dfs-r3246/net80211/ieee80211_input.c IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ni->ni_macaddr, "data", "%s", "demic error"); IEEE80211_NODE_STAT(ni, rx_demicfail); -@@ -4221,6 +4221,47 @@ +@@ -4222,6 +4222,47 @@ } #endif @@ -267,10 +267,10 @@ Index: madwifi-dfs-r3246/net80211/ieee80211_input.c #ifdef IEEE80211_DEBUG /* * Debugging support. -Index: madwifi-dfs-r3246/net80211/ieee80211_proto.h +Index: madwifi-dfs-r3280/net80211/ieee80211_proto.h =================================================================== ---- madwifi-dfs-r3246.orig/net80211/ieee80211_proto.h 2008-01-25 16:27:28.000000000 +0100 -+++ madwifi-dfs-r3246/net80211/ieee80211_proto.h 2008-01-25 16:36:01.934004465 +0100 +--- madwifi-dfs-r3280.orig/net80211/ieee80211_proto.h 2008-01-28 17:13:49.000000000 +0100 ++++ madwifi-dfs-r3280/net80211/ieee80211_proto.h 2008-01-28 17:15:05.935802033 +0100 @@ -90,6 +90,7 @@ void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode); enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *); @@ -279,25 +279,25 @@ Index: madwifi-dfs-r3246/net80211/ieee80211_proto.h /* * Return the size of the 802.11 header for a management or data frame. -Index: madwifi-dfs-r3246/net80211/ieee80211_linux.c +Index: madwifi-dfs-r3280/net80211/ieee80211_linux.c =================================================================== ---- madwifi-dfs-r3246.orig/net80211/ieee80211_linux.c 2008-01-25 16:28:31.280323176 +0100 -+++ madwifi-dfs-r3246/net80211/ieee80211_linux.c 2008-01-25 16:36:01.934004465 +0100 +--- madwifi-dfs-r3280.orig/net80211/ieee80211_linux.c 2008-01-28 17:14:16.091929418 +0100 ++++ madwifi-dfs-r3280/net80211/ieee80211_linux.c 2008-01-28 17:18:40.397276522 +0100 @@ -337,8 +337,8 @@ /* TODO: needed parameters: count, keyid, key type, src address, TSC */ - snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag, + snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=" MAC_FMT ")", tag, k->wk_keyix, - IEEE80211_IS_MULTICAST(wh->i_addr1) ? "broad" : "uni", -- ether_sprintf(wh->i_addr1)); +- MAC_ADDR(wh->i_addr1)); + IEEE80211_IS_MULTICAST(wh->i_addr2) ? "broad" : "uni", -+ ether_sprintf(wh->i_addr2)); ++ MAC_ADDR(wh->i_addr2)); memset(&wrqu, 0, sizeof(wrqu)); wrqu.data.length = strlen(buf); wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf); -Index: madwifi-dfs-r3246/net80211/ieee80211_output.c +Index: madwifi-dfs-r3280/net80211/ieee80211_output.c =================================================================== ---- madwifi-dfs-r3246.orig/net80211/ieee80211_output.c 2008-01-25 16:27:28.000000000 +0100 -+++ madwifi-dfs-r3246/net80211/ieee80211_output.c 2008-01-25 16:36:01.938004695 +0100 +--- madwifi-dfs-r3280.orig/net80211/ieee80211_output.c 2008-01-28 17:13:49.000000000 +0100 ++++ madwifi-dfs-r3280/net80211/ieee80211_output.c 2008-01-28 17:15:06.247663812 +0100 @@ -1083,13 +1083,16 @@ cip = (struct ieee80211_cipher *) key->wk_cipher; ciphdrsize = cip->ic_header; @@ -318,10 +318,10 @@ Index: madwifi-dfs-r3246/net80211/ieee80211_output.c /* * Allocate sk_buff for each subsequent fragment; First fragment -Index: madwifi-dfs-r3246/net80211/ieee80211_node.c +Index: madwifi-dfs-r3280/net80211/ieee80211_node.c =================================================================== ---- madwifi-dfs-r3246.orig/net80211/ieee80211_node.c 2008-01-25 16:33:11.540294282 +0100 -+++ madwifi-dfs-r3246/net80211/ieee80211_node.c 2008-01-25 16:36:01.938004695 +0100 +--- madwifi-dfs-r3280.orig/net80211/ieee80211_node.c 2008-01-28 17:14:55.410170040 +0100 ++++ madwifi-dfs-r3280/net80211/ieee80211_node.c 2008-01-28 17:15:06.351617734 +0100 @@ -2259,11 +2259,13 @@ /* From this point onwards we can no longer find the node, * so no more references are generated -- cgit v1.2.3