aboutsummaryrefslogtreecommitdiffstats
path: root/package/madwifi/patches/309-micfail_detect.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/madwifi/patches/309-micfail_detect.patch')
-rw-r--r--package/madwifi/patches/309-micfail_detect.patch96
1 files changed, 48 insertions, 48 deletions
diff --git a/package/madwifi/patches/309-micfail_detect.patch b/package/madwifi/patches/309-micfail_detect.patch
index 34f80d659b..c1b6224425 100644
--- a/package/madwifi/patches/309-micfail_detect.patch
+++ b/package/madwifi/patches/309-micfail_detect.patch
@@ -1,8 +1,8 @@
-Index: madwifi-dfs-r3053/ath/if_ath.c
+Index: madwifi-dfs-r3246/ath/if_ath.c
===================================================================
---- 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 @@
+--- 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 @@
u_int phyerr;
u_int processed = 0, early_stop = 0;
u_int rx_limit = dev->quota;
@@ -10,7 +10,7 @@ Index: madwifi-dfs-r3053/ath/if_ath.c
DPRINTF(sc, ATH_DEBUG_RX_PROC, "%s\n", __func__);
process_rx_again:
-@@ -6418,24 +6419,8 @@
+@@ -6492,24 +6493,8 @@
}
if (rs->rs_status & HAL_RXERR_MIC) {
sc->sc_stats.ast_rx_badmic++;
@@ -26,7 +26,7 @@ Index: madwifi-dfs-r3053/ath/if_ath.c
-#if 0
-/* XXX revalidate MIC, lookup ni to find VAP */
- ieee80211_notify_michael_failure(ic,
-- (struct ieee80211_frame *) skb->data,
+- (struct ieee80211_frame *)skb->data,
- sc->sc_splitmic ?
- rs->rs_keyix - 32 : rs->rs_keyix
- );
@@ -37,7 +37,7 @@ Index: madwifi-dfs-r3053/ath/if_ath.c
}
/*
* Reject error frames if we have no vaps that
-@@ -6494,8 +6479,9 @@
+@@ -6562,8 +6547,9 @@
/*
* Finished monitor mode handling, now reject
* error frames before passing to other vaps
@@ -48,7 +48,7 @@ Index: madwifi-dfs-r3053/ath/if_ath.c
ieee80211_dev_kfree_skb(&skb);
goto rx_next;
}
-@@ -6503,6 +6489,26 @@
+@@ -6571,6 +6557,26 @@
/* remove the CRC */
skb_trim(skb, skb->len - IEEE80211_CRC_LEN);
@@ -75,18 +75,18 @@ Index: madwifi-dfs-r3053/ath/if_ath.c
/*
* From this point on we assume the frame is at least
* as large as ieee80211_frame_min; verify that.
-@@ -6524,6 +6530,7 @@
- sc->sc_hwmap[rs->rs_rate].ieeerate,
- rs->rs_rssi);
+@@ -6583,6 +6589,7 @@
+ goto rx_next;
+ }
+ /* MIC failure. Drop the packet in any case */
/*
- * Locate the node for sender, track state, and then
- * pass the (referenced) node up to the 802.11 layer
-Index: madwifi-dfs-r3053/net80211/ieee80211_crypto_ccmp.c
+ * Normal receive.
+ */
+Index: madwifi-dfs-r3246/net80211/ieee80211_crypto_ccmp.c
===================================================================
---- 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
+--- 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
@@ -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-r3053/net80211/ieee80211_crypto_ccmp.c
{
return 1;
}
-Index: madwifi-dfs-r3053/net80211/ieee80211_crypto.h
+Index: madwifi-dfs-r3246/net80211/ieee80211_crypto.h
===================================================================
---- 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
+--- 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
@@ -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-r3053/net80211/ieee80211_crypto.h
}
/*
-Index: madwifi-dfs-r3053/net80211/ieee80211_crypto_none.c
+Index: madwifi-dfs-r3246/net80211/ieee80211_crypto_none.c
===================================================================
---- 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
+--- 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
@@ -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-r3053/net80211/ieee80211_crypto_none.c
{
struct ieee80211vap *vap = k->wk_private;
-Index: madwifi-dfs-r3053/net80211/ieee80211_crypto_tkip.c
+Index: madwifi-dfs-r3246/net80211/ieee80211_crypto_tkip.c
===================================================================
---- 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
+--- 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
@@ -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-r3053/net80211/ieee80211_crypto_tkip.c
struct ieee80211vap *vap = ctx->tc_vap;
u8 mic[IEEE80211_WEP_MICLEN];
u8 mic0[IEEE80211_WEP_MICLEN];
-Index: madwifi-dfs-r3053/net80211/ieee80211_crypto_wep.c
+Index: madwifi-dfs-r3246/net80211/ieee80211_crypto_wep.c
===================================================================
---- 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
+--- 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
@@ -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-dfs-r3053/net80211/ieee80211_crypto_wep.c
{
return 1;
}
-Index: madwifi-dfs-r3053/net80211/ieee80211_input.c
+Index: madwifi-dfs-r3246/net80211/ieee80211_input.c
===================================================================
---- 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 @@
+--- 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
+@@ -669,7 +669,7 @@
* Next strip any MSDU crypto bits.
*/
if (key != NULL &&
@@ -219,7 +219,7 @@ Index: madwifi-dfs-r3053/net80211/ieee80211_input.c
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
ni->ni_macaddr, "data", "%s", "demic error");
IEEE80211_NODE_STAT(ni, rx_demicfail);
-@@ -4168,6 +4168,47 @@
+@@ -4221,6 +4221,47 @@
}
#endif
@@ -267,11 +267,11 @@ Index: madwifi-dfs-r3053/net80211/ieee80211_input.c
#ifdef IEEE80211_DEBUG
/*
* Debugging support.
-Index: madwifi-dfs-r3053/net80211/ieee80211_proto.h
+Index: madwifi-dfs-r3246/net80211/ieee80211_proto.h
===================================================================
---- 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 @@
+--- 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
+@@ -90,6 +90,7 @@
void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode);
enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *);
void ieee80211_send_pspoll(struct ieee80211_node *);
@@ -279,10 +279,10 @@ Index: madwifi-dfs-r3053/net80211/ieee80211_proto.h
/*
* Return the size of the 802.11 header for a management or data frame.
-Index: madwifi-dfs-r3053/net80211/ieee80211_linux.c
+Index: madwifi-dfs-r3246/net80211/ieee80211_linux.c
===================================================================
---- 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
+--- 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
@@ -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-dfs-r3053/net80211/ieee80211_linux.c
memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.length = strlen(buf);
wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
-Index: madwifi-dfs-r3053/net80211/ieee80211_output.c
+Index: madwifi-dfs-r3246/net80211/ieee80211_output.c
===================================================================
---- 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 @@
+--- 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
+@@ -1083,13 +1083,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-dfs-r3053/net80211/ieee80211_output.c
/*
* Allocate sk_buff for each subsequent fragment; First fragment
-Index: madwifi-dfs-r3053/net80211/ieee80211_node.c
+Index: madwifi-dfs-r3246/net80211/ieee80211_node.c
===================================================================
---- 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 @@
+--- 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
+@@ -2259,11 +2259,13 @@
/* From this point onwards we can no longer find the node,
* so no more references are generated
*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 02:25:22 +0000