qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

update to the latest madwifi snapshot

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7864 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
2007-07-03 21:03:58 +00:00
parent f791c43be8
commit 1f9285016a
26 changed files with 338 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,16 +1,16 @@
Index: madwifi-ng-r2420-20070602/ath/if_ath.c
Index: madwifi-ng-r2525-20070630/ath/if_ath.c
===================================================================
--- madwifi-ng-r2420-20070602.orig/ath/if_ath.c 2007-06-30 23:52:00.743038750 +0200
+++ madwifi-ng-r2420-20070602/ath/if_ath.c 2007-07-01 00:12:19.127183000 +0200
@@ -5602,6 +5602,7 @@
u_int phyerr;
--- madwifi-ng-r2525-20070630.orig/ath/if_ath.c 2007-07-03 23:02:33.594143250 +0200
+++ madwifi-ng-r2525-20070630/ath/if_ath.c 2007-07-03 23:02:34.014169500 +0200
@@ -5626,6 +5626,7 @@
u_int64_t rs_tsf;
u_int processed = 0, early_stop = 0;
u_int rx_limit = dev->quota;
+ u_int mic_fail = 0;
/* Let the 802.11 layer know about the new noise floor */
sc->sc_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
@@ -5696,25 +5697,7 @@
@@ -5720,25 +5721,7 @@
}
if (rs->rs_status & HAL_RXERR_MIC) {
sc->sc_stats.ast_rx_badmic++;
@@ -37,7 +37,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
}
/*
* Reject error frames if we have no vaps that
@@ -5772,8 +5755,9 @@
@@ -5802,8 +5785,9 @@
/*
* Finished monitor mode handling, now reject
* error frames before passing to other vaps
@@ -48,7 +48,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
dev_kfree_skb(skb);
skb = NULL;
goto rx_next;
@@ -5804,6 +5788,27 @@
@@ -5834,6 +5818,27 @@
sc->sc_hwmap[rs->rs_rate].ieeerate,
rs->rs_rssi);
@@ -56,7 +56,7 @@ Index: madwifi-ng-r2420-20070602/ath/if_ath.c
+ if (mic_fail) {
+ /* Ignore control frames which are reported with mic error */
+ if ((((struct ieee80211_frame *)skb->data)->i_fc[0] &
+ IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL)
+ IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL)
+ goto drop_micfail;
+
+ ni = ieee80211_find_rxnode(ic, (const struct ieee80211_frame_min *) skb->data);
@@ -76,11 +76,11 @@ Index: madwifi-ng-r2420-20070602/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-r2420-20070602/net80211/ieee80211_crypto_ccmp.c
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_ccmp.c
===================================================================
--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_crypto_ccmp.c 2007-06-30 23:52:00.042995000 +0200
+++ madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_ccmp.c 2007-06-30 23:52:00.999054750 +0200
@@ -78,7 +78,7 @@
--- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_crypto_ccmp.c 2007-07-03 23:02:31.690024250 +0200
+++ madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_ccmp.c 2007-07-03 23:02:34.026170250 +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);
static int ccmp_enmic(struct ieee80211_key *, struct sk_buff *, int);
@@ -89,7 +89,7 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_ccmp.c
static const struct ieee80211_cipher ccmp = {
.ic_name = "AES-CCM",
@@ -304,7 +304,7 @@
@@ -308,7 +308,7 @@
* Verify and strip MIC from the frame.
*/
static int
@@ -98,10 +98,10 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_ccmp.c
{
return 1;
}
Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto.h
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto.h
===================================================================
--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_crypto.h 2007-06-30 23:51:53.942613750 +0200
+++ madwifi-ng-r2420-20070602/net80211/ieee80211_crypto.h 2007-06-30 23:52:01.107061500 +0200
--- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_crypto.h 2007-07-03 23:02:24.549578000 +0200
+++ madwifi-ng-r2525-20070630/net80211/ieee80211_crypto.h 2007-07-03 23:02:34.054172000 +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);
@@ -124,10 +124,10 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto.h
}
/*
Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_none.c
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_none.c
===================================================================
--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_crypto_none.c 2007-06-30 23:51:53.950614250 +0200
+++ madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_none.c 2007-06-30 23:52:01.171065500 +0200
--- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_crypto_none.c 2007-07-03 23:02:24.557578500 +0200
+++ madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_none.c 2007-07-03 23:02:34.074173250 +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);
@@ -146,10 +146,10 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_none.c
{
struct ieee80211vap *vap = k->wk_private;
Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_tkip.c
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_tkip.c
===================================================================
--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_crypto_tkip.c 2007-06-30 23:51:53.958614750 +0200
+++ madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_tkip.c 2007-06-30 23:52:01.203067500 +0200
--- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_crypto_tkip.c 2007-07-03 23:02:24.565579000 +0200
+++ madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_tkip.c 2007-07-03 23:02:34.114175750 +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);
@@ -177,10 +177,10 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_tkip.c
struct ieee80211vap *vap = ctx->tc_vap;
u8 mic[IEEE80211_WEP_MICLEN];
u8 mic0[IEEE80211_WEP_MICLEN];
Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_wep.c
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_wep.c
===================================================================
--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_crypto_wep.c 2007-06-30 23:51:53.966615250 +0200
+++ madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_wep.c 2007-06-30 23:52:01.211068000 +0200
--- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_crypto_wep.c 2007-07-03 23:02:24.573579500 +0200
+++ madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_wep.c 2007-07-03 23:02:34.134177000 +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);
@@ -199,10 +199,10 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_crypto_wep.c
{
return 1;
}
Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_input.c
===================================================================
--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_input.c 2007-06-30 23:52:00.799042250 +0200
+++ madwifi-ng-r2420-20070602/net80211/ieee80211_input.c 2007-06-30 23:52:01.239069750 +0200
--- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_input.c 2007-07-03 23:02:33.598143500 +0200
+++ madwifi-ng-r2525-20070630/net80211/ieee80211_input.c 2007-07-03 23:02:34.134177000 +0200
@@ -632,7 +632,7 @@
* Next strip any MSDU crypto bits.
*/
@@ -212,12 +212,12 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
ni->ni_macaddr, "data", "%s", "demic error");
IEEE80211_NODE_STAT(ni, rx_demicfail);
@@ -3730,6 +3730,47 @@
@@ -3771,6 +3771,47 @@
}
#endif
+/*
+ * Process a frame w/ hw detected MIC failure.
+ * Process a frame w/ hw detected MIC failure.
+ * The frame will be dropped in any case.
+ */
+void
@@ -229,7 +229,7 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
+ struct ieee80211_key *key;
+ int hdrspace;
+ struct ieee80211com *ic = vap->iv_ic;
+
+
+ if (skb->len < sizeof(struct ieee80211_frame_min)) {
+ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
+ ni->ni_macaddr, NULL,
@@ -239,7 +239,7 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
+ }
+
+ wh = (struct ieee80211_frame *)skb->data;
+
+
+ hdrspace = ieee80211_hdrspace(ic, wh);
+ key = ieee80211_crypto_decap(ni, skb, hdrspace);
+ if (key == NULL) {
@@ -260,10 +260,10 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_input.c
#ifdef IEEE80211_DEBUG
/*
* Debugging support.
Index: madwifi-ng-r2420-20070602/net80211/ieee80211_proto.h
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_proto.h
===================================================================
--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_proto.h 2007-06-30 23:52:00.331013000 +0200
+++ madwifi-ng-r2420-20070602/net80211/ieee80211_proto.h 2007-06-30 23:52:01.295073250 +0200
--- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_proto.h 2007-07-03 23:02:24.589580500 +0200
+++ madwifi-ng-r2525-20070630/net80211/ieee80211_proto.h 2007-07-03 23:02:34.190180500 +0200
@@ -91,6 +91,7 @@
void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode);
enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *);
@@ -272,10 +272,10 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_proto.h
/*
* Return the size of the 802.11 header for a management or data frame.
Index: madwifi-ng-r2420-20070602/net80211/ieee80211_linux.c
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_linux.c
===================================================================
--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_linux.c 2007-06-30 23:52:00.026994000 +0200
+++ madwifi-ng-r2420-20070602/net80211/ieee80211_linux.c 2007-06-30 23:52:01.347076500 +0200
--- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_linux.c 2007-07-03 23:02:31.362003750 +0200
+++ madwifi-ng-r2525-20070630/net80211/ieee80211_linux.c 2007-07-03 23:02:34.218182250 +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,
@@ -287,11 +287,11 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_linux.c
memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.length = strlen(buf);
wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
Index: madwifi-ng-r2420-20070602/net80211/ieee80211_output.c
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_output.c
===================================================================
--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_output.c 2007-06-30 23:52:00.118999750 +0200
+++ madwifi-ng-r2420-20070602/net80211/ieee80211_output.c 2007-06-30 23:52:01.355077000 +0200
@@ -1077,13 +1077,16 @@
--- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_output.c 2007-07-03 23:02:24.605581500 +0200
+++ madwifi-ng-r2525-20070630/net80211/ieee80211_output.c 2007-07-03 23:02:34.218182250 +0200
@@ -1079,13 +1079,16 @@
cip = (struct ieee80211_cipher *) key->wk_cipher;
ciphdrsize = cip->ic_header;
tailsize += (cip->ic_trailer + cip->ic_miclen);
@@ -311,11 +311,11 @@ Index: madwifi-ng-r2420-20070602/net80211/ieee80211_output.c
/*
* Allocate sk_buff for each subsequent fragment; First fragment
Index: madwifi-ng-r2420-20070602/net80211/ieee80211_node.c
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_node.c
===================================================================
--- madwifi-ng-r2420-20070602.orig/net80211/ieee80211_node.c 2007-06-30 23:52:54.850420250 +0200
+++ madwifi-ng-r2420-20070602/net80211/ieee80211_node.c 2007-07-01 00:18:32.370509250 +0200
@@ -1885,11 +1885,13 @@
--- madwifi-ng-r2525-20070630.orig/net80211/ieee80211_node.c 2007-07-03 23:02:33.598143500 +0200
+++ madwifi-ng-r2525-20070630/net80211/ieee80211_node.c 2007-07-03 23:02:34.266185250 +0200
@@ -1891,11 +1891,13 @@
/* From this point onwards we can no longer find the node,
* so no more references are generated
*/