diff options
Diffstat (limited to 'package/madwifi/patches/309-micfail_detect.patch')
| -rw-r--r-- | package/madwifi/patches/309-micfail_detect.patch | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/package/madwifi/patches/309-micfail_detect.patch b/package/madwifi/patches/309-micfail_detect.patch index 5eac13538..34f80d659 100644 --- a/package/madwifi/patches/309-micfail_detect.patch +++ b/package/madwifi/patches/309-micfail_detect.patch @@ -1,8 +1,8 @@ -Index: madwifi-ng-r2978-20071127/ath/if_ath.c +Index: madwifi-dfs-r3053/ath/if_ath.c =================================================================== ---- madwifi-ng-r2978-20071127.orig/ath/if_ath.c 2007-11-27 21:50:53.125694356 +0100 -+++ madwifi-ng-r2978-20071127/ath/if_ath.c 2007-11-27 21:59:09.565984878 +0100 -@@ -6085,6 +6085,7 @@ +--- madwifi-dfs-r3053.orig/ath/if_ath.c 2007-12-13 05:25:13.934419543 +0100 ++++ madwifi-dfs-r3053/ath/if_ath.c 2007-12-13 05:25:14.210435274 +0100 +@@ -6322,6 +6322,7 @@ u_int phyerr; u_int processed = 0, early_stop = 0; u_int rx_limit = dev->quota; @@ -10,7 +10,7 @@ Index: madwifi-ng-r2978-20071127/ath/if_ath.c DPRINTF(sc, ATH_DEBUG_RX_PROC, "%s\n", __func__); process_rx_again: -@@ -6181,24 +6182,8 @@ +@@ -6418,24 +6419,8 @@ } if (rs->rs_status & HAL_RXERR_MIC) { sc->sc_stats.ast_rx_badmic++; @@ -37,7 +37,7 @@ Index: madwifi-ng-r2978-20071127/ath/if_ath.c } /* * Reject error frames if we have no vaps that -@@ -6257,8 +6242,9 @@ +@@ -6494,8 +6479,9 @@ /* * Finished monitor mode handling, now reject * error frames before passing to other vaps @@ -48,7 +48,7 @@ Index: madwifi-ng-r2978-20071127/ath/if_ath.c ieee80211_dev_kfree_skb(&skb); goto rx_next; } -@@ -6266,6 +6252,26 @@ +@@ -6503,6 +6489,26 @@ /* remove the CRC */ skb_trim(skb, skb->len - IEEE80211_CRC_LEN); @@ -75,7 +75,7 @@ Index: madwifi-ng-r2978-20071127/ath/if_ath.c /* * From this point on we assume the frame is at least * as large as ieee80211_frame_min; verify that. -@@ -6287,6 +6293,7 @@ +@@ -6524,6 +6530,7 @@ sc->sc_hwmap[rs->rs_rate].ieeerate, rs->rs_rssi); @@ -83,10 +83,10 @@ Index: madwifi-ng-r2978-20071127/ath/if_ath.c /* * Locate the node for sender, track state, and then * pass the (referenced) node up to the 802.11 layer -Index: madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_ccmp.c +Index: madwifi-dfs-r3053/net80211/ieee80211_crypto_ccmp.c =================================================================== ---- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_crypto_ccmp.c 2007-11-27 21:43:39.604989422 +0100 -+++ madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_ccmp.c 2007-11-27 21:58:39.516272443 +0100 +--- madwifi-dfs-r3053.orig/net80211/ieee80211_crypto_ccmp.c 2007-12-13 05:25:12.634345457 +0100 ++++ madwifi-dfs-r3053/net80211/ieee80211_crypto_ccmp.c 2007-12-13 05:25:14.210435274 +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-ng-r2978-20071127/net80211/ieee80211_crypto_ccmp.c { return 1; } -Index: madwifi-ng-r2978-20071127/net80211/ieee80211_crypto.h +Index: madwifi-dfs-r3053/net80211/ieee80211_crypto.h =================================================================== ---- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_crypto.h 2007-10-29 23:33:03.000000000 +0100 -+++ madwifi-ng-r2978-20071127/net80211/ieee80211_crypto.h 2007-11-27 21:58:39.524272897 +0100 +--- madwifi-dfs-r3053.orig/net80211/ieee80211_crypto.h 2007-12-13 05:25:10.214207541 +0100 ++++ madwifi-dfs-r3053/net80211/ieee80211_crypto.h 2007-12-13 05:25:14.210435274 +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-ng-r2978-20071127/net80211/ieee80211_crypto.h } /* -Index: madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_none.c +Index: madwifi-dfs-r3053/net80211/ieee80211_crypto_none.c =================================================================== ---- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_crypto_none.c 2006-09-20 10:45:13.000000000 +0200 -+++ madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_none.c 2007-11-27 21:58:39.528273126 +0100 +--- madwifi-dfs-r3053.orig/net80211/ieee80211_crypto_none.c 2007-12-13 05:25:10.218207770 +0100 ++++ madwifi-dfs-r3053/net80211/ieee80211_crypto_none.c 2007-12-13 05:25:14.214435503 +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-ng-r2978-20071127/net80211/ieee80211_crypto_none.c { struct ieee80211vap *vap = k->wk_private; -Index: madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_tkip.c +Index: madwifi-dfs-r3053/net80211/ieee80211_crypto_tkip.c =================================================================== ---- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_crypto_tkip.c 2007-10-28 21:40:04.000000000 +0100 -+++ madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_tkip.c 2007-11-27 21:58:39.532273356 +0100 +--- madwifi-dfs-r3053.orig/net80211/ieee80211_crypto_tkip.c 2007-12-13 05:25:10.226208226 +0100 ++++ madwifi-dfs-r3053/net80211/ieee80211_crypto_tkip.c 2007-12-13 05:25:14.214435503 +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-ng-r2978-20071127/net80211/ieee80211_crypto_tkip.c struct ieee80211vap *vap = ctx->tc_vap; u8 mic[IEEE80211_WEP_MICLEN]; u8 mic0[IEEE80211_WEP_MICLEN]; -Index: madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_wep.c +Index: madwifi-dfs-r3053/net80211/ieee80211_crypto_wep.c =================================================================== ---- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_crypto_wep.c 2007-05-29 23:55:25.000000000 +0200 -+++ madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_wep.c 2007-11-27 21:58:39.536273583 +0100 +--- madwifi-dfs-r3053.orig/net80211/ieee80211_crypto_wep.c 2007-12-13 05:25:10.234208681 +0100 ++++ madwifi-dfs-r3053/net80211/ieee80211_crypto_wep.c 2007-12-13 05:25:14.214435503 +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,11 +206,11 @@ Index: madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_wep.c { return 1; } -Index: madwifi-ng-r2978-20071127/net80211/ieee80211_input.c +Index: madwifi-dfs-r3053/net80211/ieee80211_input.c =================================================================== ---- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_input.c 2007-11-27 21:50:53.133694814 +0100 -+++ madwifi-ng-r2978-20071127/net80211/ieee80211_input.c 2007-11-27 21:58:39.536273583 +0100 -@@ -640,7 +640,7 @@ +--- madwifi-dfs-r3053.orig/net80211/ieee80211_input.c 2007-12-13 05:25:13.938419772 +0100 ++++ madwifi-dfs-r3053/net80211/ieee80211_input.c 2007-12-13 05:25:14.218435729 +0100 +@@ -646,7 +646,7 @@ * Next strip any MSDU crypto bits. */ if (key != NULL && @@ -219,7 +219,7 @@ Index: madwifi-ng-r2978-20071127/net80211/ieee80211_input.c IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ni->ni_macaddr, "data", "%s", "demic error"); IEEE80211_NODE_STAT(ni, rx_demicfail); -@@ -3812,6 +3812,47 @@ +@@ -4168,6 +4168,47 @@ } #endif @@ -267,10 +267,10 @@ Index: madwifi-ng-r2978-20071127/net80211/ieee80211_input.c #ifdef IEEE80211_DEBUG /* * Debugging support. -Index: madwifi-ng-r2978-20071127/net80211/ieee80211_proto.h +Index: madwifi-dfs-r3053/net80211/ieee80211_proto.h =================================================================== ---- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_proto.h 2007-06-18 19:14:03.000000000 +0200 -+++ madwifi-ng-r2978-20071127/net80211/ieee80211_proto.h 2007-11-27 21:58:39.540273808 +0100 +--- madwifi-dfs-r3053.orig/net80211/ieee80211_proto.h 2007-12-13 05:25:10.246209365 +0100 ++++ madwifi-dfs-r3053/net80211/ieee80211_proto.h 2007-12-13 05:25:14.218435729 +0100 @@ -91,6 +91,7 @@ void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode); enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *); @@ -279,10 +279,10 @@ Index: madwifi-ng-r2978-20071127/net80211/ieee80211_proto.h /* * Return the size of the 802.11 header for a management or data frame. -Index: madwifi-ng-r2978-20071127/net80211/ieee80211_linux.c +Index: madwifi-dfs-r3053/net80211/ieee80211_linux.c =================================================================== ---- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_linux.c 2007-11-27 21:43:39.592988736 +0100 -+++ madwifi-ng-r2978-20071127/net80211/ieee80211_linux.c 2007-11-27 21:58:39.540273808 +0100 +--- madwifi-dfs-r3053.orig/net80211/ieee80211_linux.c 2007-12-13 05:25:12.422333377 +0100 ++++ madwifi-dfs-r3053/net80211/ieee80211_linux.c 2007-12-13 05:25:14.218435729 +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, @@ -294,11 +294,11 @@ Index: madwifi-ng-r2978-20071127/net80211/ieee80211_linux.c memset(&wrqu, 0, sizeof(wrqu)); wrqu.data.length = strlen(buf); wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf); -Index: madwifi-ng-r2978-20071127/net80211/ieee80211_output.c +Index: madwifi-dfs-r3053/net80211/ieee80211_output.c =================================================================== ---- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_output.c 2007-11-22 03:08:35.000000000 +0100 -+++ madwifi-ng-r2978-20071127/net80211/ieee80211_output.c 2007-11-27 21:58:39.540273808 +0100 -@@ -1093,13 +1093,16 @@ +--- madwifi-dfs-r3053.orig/net80211/ieee80211_output.c 2007-12-13 05:25:10.262210276 +0100 ++++ madwifi-dfs-r3053/net80211/ieee80211_output.c 2007-12-13 05:25:14.222435959 +0100 +@@ -1092,13 +1092,16 @@ cip = (struct ieee80211_cipher *) key->wk_cipher; ciphdrsize = cip->ic_header; tailsize += (cip->ic_trailer + cip->ic_miclen); @@ -318,11 +318,11 @@ Index: madwifi-ng-r2978-20071127/net80211/ieee80211_output.c /* * Allocate sk_buff for each subsequent fragment; First fragment -Index: madwifi-ng-r2978-20071127/net80211/ieee80211_node.c +Index: madwifi-dfs-r3053/net80211/ieee80211_node.c =================================================================== ---- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_node.c 2007-11-27 21:50:53.141695270 +0100 -+++ madwifi-ng-r2978-20071127/net80211/ieee80211_node.c 2007-11-27 21:59:52.592436814 +0100 -@@ -2165,11 +2165,13 @@ +--- madwifi-dfs-r3053.orig/net80211/ieee80211_node.c 2007-12-13 05:25:13.938419772 +0100 ++++ madwifi-dfs-r3053/net80211/ieee80211_node.c 2007-12-13 05:25:14.222435959 +0100 +@@ -2236,11 +2236,13 @@ /* From this point onwards we can no longer find the node, * so no more references are generated */ |