-Index: madwifi-ng-r2834-20071106/ath/if_ath.c
+Index: madwifi-dfs-r3053/ath/if_ath.c
===================================================================
---- madwifi-ng-r2834-20071106.orig/ath/if_ath.c 2007-11-07 14:02:05.345675505 +0100
-+++ madwifi-ng-r2834-20071106/ath/if_ath.c 2007-11-07 14:02:05.625691466 +0100
-@@ -5743,6 +5743,7 @@
- u_int64_t rs_tsf;
+--- 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;
+ u_int mic_fail = 0;
DPRINTF(sc, ATH_DEBUG_RX_PROC, "%s\n", __func__);
process_rx_again:
-@@ -5839,24 +5840,8 @@
+@@ -6418,24 +6419,8 @@
}
if (rs->rs_status & HAL_RXERR_MIC) {
sc->sc_stats.ast_rx_badmic++;
+ goto rx_accept;
}
/*
- * Reject error frames if we have no vaps that
-@@ -5920,8 +5905,9 @@
+ * Reject error frames if we have no vaps that
+@@ -6494,8 +6479,9 @@
/*
* Finished monitor mode handling, now reject
* error frames before passing to other vaps
*/
- if (rs->rs_status != 0) {
+ if (rs->rs_status & ~(HAL_RXERR_MIC | HAL_RXERR_DECRYPT)) {
- dev_kfree_skb(skb);
- skb = NULL;
+ ieee80211_dev_kfree_skb(&skb);
goto rx_next;
-@@ -5930,6 +5916,26 @@
+ }
+@@ -6503,6 +6489,26 @@
/* remove the CRC */
skb_trim(skb, skb->len - IEEE80211_CRC_LEN);
/*
* From this point on we assume the frame is at least
* as large as ieee80211_frame_min; verify that.
-@@ -5952,6 +5958,7 @@
+@@ -6524,6 +6530,7 @@
sc->sc_hwmap[rs->rs_rate].ieeerate,
rs->rs_rssi);
/*
* Locate the node for sender, track state, and then
* pass the (referenced) node up to the 802.11 layer
-Index: madwifi-ng-r2834-20071106/net80211/ieee80211_crypto_ccmp.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_crypto_ccmp.c
===================================================================
---- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_crypto_ccmp.c 2007-11-07 14:02:03.345561529 +0100
-+++ madwifi-ng-r2834-20071106/net80211/ieee80211_crypto_ccmp.c 2007-11-07 14:02:05.625691466 +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);
{
return 1;
}
-Index: madwifi-ng-r2834-20071106/net80211/ieee80211_crypto.h
+Index: madwifi-dfs-r3053/net80211/ieee80211_crypto.h
===================================================================
---- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_crypto.h 2007-11-07 14:01:58.929309860 +0100
-+++ madwifi-ng-r2834-20071106/net80211/ieee80211_crypto.h 2007-11-07 14:02:05.633691920 +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);
}
/*
-Index: madwifi-ng-r2834-20071106/net80211/ieee80211_crypto_none.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_crypto_none.c
===================================================================
---- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_crypto_none.c 2007-11-07 14:01:58.937310316 +0100
-+++ madwifi-ng-r2834-20071106/net80211/ieee80211_crypto_none.c 2007-11-07 14:02:05.633691920 +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);
{
struct ieee80211vap *vap = k->wk_private;
-Index: madwifi-ng-r2834-20071106/net80211/ieee80211_crypto_tkip.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_crypto_tkip.c
===================================================================
---- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_crypto_tkip.c 2007-11-07 14:01:58.945310770 +0100
-+++ madwifi-ng-r2834-20071106/net80211/ieee80211_crypto_tkip.c 2007-11-07 14:02:05.633691920 +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);
struct ieee80211vap *vap = ctx->tc_vap;
u8 mic[IEEE80211_WEP_MICLEN];
u8 mic0[IEEE80211_WEP_MICLEN];
-Index: madwifi-ng-r2834-20071106/net80211/ieee80211_crypto_wep.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_crypto_wep.c
===================================================================
---- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_crypto_wep.c 2007-11-07 14:01:58.953311229 +0100
-+++ madwifi-ng-r2834-20071106/net80211/ieee80211_crypto_wep.c 2007-11-07 14:02:05.633691920 +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);
{
return 1;
}
-Index: madwifi-ng-r2834-20071106/net80211/ieee80211_input.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_input.c
===================================================================
---- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_input.c 2007-11-07 14:02:05.349675734 +0100
-+++ madwifi-ng-r2834-20071106/net80211/ieee80211_input.c 2007-11-07 14:02:05.637692150 +0100
-@@ -632,7 +632,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 &&
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
ni->ni_macaddr, "data", "%s", "demic error");
IEEE80211_NODE_STAT(ni, rx_demicfail);
-@@ -3781,6 +3781,47 @@
+@@ -4168,6 +4168,47 @@
}
#endif
#ifdef IEEE80211_DEBUG
/*
* Debugging support.
-Index: madwifi-ng-r2834-20071106/net80211/ieee80211_proto.h
+Index: madwifi-dfs-r3053/net80211/ieee80211_proto.h
===================================================================
---- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_proto.h 2007-11-07 14:01:58.965311910 +0100
-+++ madwifi-ng-r2834-20071106/net80211/ieee80211_proto.h 2007-11-07 14:02:05.637692150 +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 *);
/*
* Return the size of the 802.11 header for a management or data frame.
-Index: madwifi-ng-r2834-20071106/net80211/ieee80211_linux.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_linux.c
===================================================================
---- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_linux.c 2007-11-07 14:02:03.137549672 +0100
-+++ madwifi-ng-r2834-20071106/net80211/ieee80211_linux.c 2007-11-07 14:02:05.641692376 +0100
-@@ -339,8 +339,8 @@
+--- 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,
k->wk_keyix,
memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.length = strlen(buf);
wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
-Index: madwifi-ng-r2834-20071106/net80211/ieee80211_output.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_output.c
===================================================================
---- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_output.c 2007-11-07 14:01:58.981312821 +0100
-+++ madwifi-ng-r2834-20071106/net80211/ieee80211_output.c 2007-11-07 14:02:05.641692376 +0100
-@@ -1079,13 +1079,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);
/*
* Allocate sk_buff for each subsequent fragment; First fragment
-Index: madwifi-ng-r2834-20071106/net80211/ieee80211_node.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_node.c
===================================================================
---- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_node.c 2007-11-07 14:02:05.357676193 +0100
-+++ madwifi-ng-r2834-20071106/net80211/ieee80211_node.c 2007-11-07 14:02:05.645692605 +0100
-@@ -1899,11 +1899,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
*/
- 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);
+- node_table_leave_locked(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);
++ node_table_leave_locked(nt, ni);
+ IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
+ }
projects / openwrt.git / blobdiff