-diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
---- madwifi-ng-r2377-20070526.old/ath/if_ath.c 2007-05-26 18:51:09.532638360 +0200
-+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c 2007-05-26 18:51:09.544636536 +0200
-@@ -5609,6 +5609,7 @@
- u_int phyerr;
+Index: madwifi-ng-r2568-20070710/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-23 01:48:46.026603077 +0200
++++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-23 01:48:46.310619260 +0200
+@@ -5632,6 +5632,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));
-@@ -5703,31 +5704,16 @@
+@@ -5726,25 +5727,7 @@
}
if (rs->rs_status & HAL_RXERR_MIC) {
sc->sc_stats.ast_rx_badmic++;
}
/*
* Reject error frames if we have no vaps that
- * are operating in monitor mode.
- */
-- if(sc->sc_nmonvaps == 0) goto rx_next;
-+ if ((rs->rs_status & ~HAL_RXERR_MIC) &&
-+ ((rs->rs_status &~ HAL_RXERR_DECRYPT) ||
-+ (sc->sc_ic.ic_opmode != IEEE80211_M_MONITOR)))
-+ goto rx_next;
- }
- rx_accept:
+@@ -5809,8 +5792,9 @@
/*
-@@ -5811,6 +5797,20 @@
+ * Finished monitor mode handling, now reject
+ * error frames before passing to other vaps
++ * Ignore MIC failures here, as we need to recheck them
+ */
+- if (rs->rs_status != 0) {
++ if (rs->rs_status & ~(HAL_RXERR_MIC | HAL_RXERR_DECRYPT)) {
+ dev_kfree_skb(skb);
+ skb = NULL;
+ goto rx_next;
+@@ -5841,6 +5825,27 @@
+ sc->sc_hwmap[rs->rs_rate].ieeerate,
rs->rs_rssi);
- }
+ /* MIC failure. Drop the packet in any case */
+ if (mic_fail) {
-+ ni = ieee80211_find_rxnode(ic,
-+ (const struct ieee80211_frame_min *) skb->data);
-+ if (ni != NULL) {
++ /* 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)
++ goto drop_micfail;
++
++ ni = ieee80211_find_rxnode(ic, (const struct ieee80211_frame_min *) skb->data);
++
++ if (ni && ni->ni_table) {
+ ieee80211_check_mic(ni, skb);
+ ieee80211_unref_node(&ni);
+ }
++
++drop_micfail:
+ dev_kfree_skb_any(skb);
+ skb = NULL;
+ mic_fail = 0;
/*
* Locate the node for sender, track state, and then
* pass the (referenced) node up to the 802.11 layer
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_ccmp.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_ccmp.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_ccmp.c 2007-05-17 00:13:10.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_ccmp.c 2007-05-26 18:51:09.545636384 +0200
-@@ -78,7 +78,7 @@
+Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_ccmp.c 2007-07-23 01:48:42.870423216 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c 2007-07-23 01:48:46.310619260 +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);
static const struct ieee80211_cipher ccmp = {
.ic_name = "AES-CCM",
-@@ -298,7 +298,7 @@
+@@ -308,7 +308,7 @@
* Verify and strip MIC from the frame.
*/
static int
{
return 1;
}
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto.h
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto.h 2007-04-16 14:32:29.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto.h 2007-05-26 18:51:09.545636384 +0200
+Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto.h 2007-07-23 01:48:36.806077628 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h 2007-07-23 01:48:46.326620171 +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);
}
/*
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_none.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_none.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_none.c 2006-09-20 10:45:13.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_none.c 2007-05-26 18:51:09.545636384 +0200
+Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_none.c 2007-07-23 01:48:36.810077857 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c 2007-07-23 01:48:46.342621086 +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);
{
struct ieee80211vap *vap = k->wk_private;
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_tkip.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_tkip.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_tkip.c 2007-05-17 00:13:10.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_tkip.c 2007-05-26 18:51:09.546636232 +0200
+Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_tkip.c 2007-07-23 01:48:36.818078312 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c 2007-07-23 01:48:46.362622225 +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);
struct ieee80211vap *vap = ctx->tc_vap;
u8 mic[IEEE80211_WEP_MICLEN];
u8 mic0[IEEE80211_WEP_MICLEN];
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_wep.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_wep.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_wep.c 2006-09-20 10:45:13.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_wep.c 2007-05-26 18:51:09.547636080 +0200
+Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_wep.c 2007-07-23 01:48:36.826078768 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c 2007-07-23 01:48:46.402624504 +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);
{
return 1;
}
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_input.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c 2007-05-26 18:51:09.534638056 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_input.c 2007-05-26 18:51:09.548635928 +0200
-@@ -654,7 +654,7 @@
+Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c 2007-07-23 01:48:45.690583928 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c 2007-07-23 01:48:46.406624734 +0200
+@@ -632,7 +632,7 @@
* Next strip any MSDU crypto bits.
*/
if (key != NULL &&
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
ni->ni_macaddr, "data", "%s", "demic error");
IEEE80211_NODE_STAT(ni, rx_demicfail);
-@@ -3789,6 +3789,47 @@
+@@ -3772,6 +3772,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
+ 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,
+ }
+
+ wh = (struct ieee80211_frame *)skb->data;
-+
++
+ hdrspace = ieee80211_hdrspace(ic, wh);
+ key = ieee80211_crypto_decap(ni, skb, hdrspace);
+ if (key == NULL) {
#ifdef IEEE80211_DEBUG
/*
* Debugging support.
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_linux.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_linux.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_linux.c 2007-05-21 17:53:39.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_linux.c 2007-05-26 18:51:09.549635776 +0200
-@@ -311,8 +311,8 @@
+Index: madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_proto.h 2007-07-23 01:48:36.838079452 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h 2007-07-23 01:48:46.438626555 +0200
+@@ -91,6 +91,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 *);
++void ieee80211_check_mic(struct ieee80211_node *, struct sk_buff *);
+ /*
+ * 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-23 01:48:42.626409310 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c 2007-07-23 01:48:46.462627924 +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,
-- keyix, IEEE80211_IS_MULTICAST(wh->i_addr1) ? "broad" : "uni",
+ k->wk_keyix,
+- IEEE80211_IS_MULTICAST(wh->i_addr1) ? "broad" : "uni",
- ether_sprintf(wh->i_addr1));
-+ keyix, IEEE80211_IS_MULTICAST(wh->i_addr2) ? "broad" : "uni",
++ IEEE80211_IS_MULTICAST(wh->i_addr2) ? "broad" : "uni",
+ ether_sprintf(wh->i_addr2));
memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.length = strlen(buf);
wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.h
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.h 2007-05-26 18:51:09.321670432 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.h 2007-05-26 18:51:09.549635776 +0200
-@@ -91,6 +91,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 *);
-+void ieee80211_check_mic(struct ieee80211_node *, struct sk_buff *);
+Index: madwifi-ng-r2568-20070710/net80211/ieee80211_output.c
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_output.c 2007-07-23 01:48:36.854080363 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_output.c 2007-07-23 01:48:46.466628154 +0200
+@@ -1079,13 +1079,16 @@
+ cip = (struct ieee80211_cipher *) key->wk_cipher;
+ ciphdrsize = cip->ic_header;
+ tailsize += (cip->ic_trailer + cip->ic_miclen);
++
++ /* add the 8 bytes MIC length */
++ if (cip->ic_cipher == IEEE80211_CIPHER_TKIP)
++ pktlen += IEEE80211_WEP_MICLEN;
+ }
- /*
- * Return the size of the 802.11 header for a management or data frame.
+ pdusize = vap->iv_fragthreshold - (hdrsize_nopad + ciphdrsize);
+ fragcnt = *framecnt =
+- ((pktlen - (hdrsize_nopad + ciphdrsize)) / pdusize) +
+- (((pktlen - (hdrsize_nopad + ciphdrsize)) %
+- pdusize == 0) ? 0 : 1);
++ ((pktlen - hdrsize_nopad) / pdusize) +
++ (((pktlen - hdrsize_nopad) % pdusize == 0) ? 0 : 1);
+
+ /*
+ * 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-23 01:48:45.694584154 +0200
++++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c 2007-07-23 01:48:46.590635219 +0200
+@@ -1891,11 +1891,13 @@
+ /* From this point onwards we can no longer find the node,
+ * so no more references are generated
+ */
+- ieee80211_remove_wds_addr(nt, ni->ni_macaddr);
+- ieee80211_del_wds_node(nt, ni);
+- IEEE80211_NODE_TABLE_LOCK_IRQ(nt);
+- _node_table_leave(nt, ni);
+- IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
++ if (nt) {
++ ieee80211_remove_wds_addr(nt, ni->ni_macaddr);
++ ieee80211_del_wds_node(nt, ni);
++ IEEE80211_NODE_TABLE_LOCK_IRQ(nt);
++ _node_table_leave(nt, ni);
++ IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
++ }
+
+ /*
+ * If node wasn't previously associated all
projects / openwrt.git / blobdiff