|
|
|
@ -1,8 +1,8 @@ |
|
|
|
|
Index: madwifi-ng-r2525-20070630/ath/if_ath.c
|
|
|
|
|
Index: madwifi-ng-r2568-20070710/ath/if_ath.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- 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 @@
|
|
|
|
|
--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-11 22:59:45.608447623 +0200
|
|
|
|
|
+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-11 22:59:46.016470876 +0200
|
|
|
|
|
@@ -5620,6 +5620,7 @@
|
|
|
|
|
u_int64_t rs_tsf;
|
|
|
|
|
u_int processed = 0, early_stop = 0;
|
|
|
|
|
u_int rx_limit = dev->quota;
|
|
|
|
@ -10,7 +10,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c |
|
|
|
|
|
|
|
|
|
/* Let the 802.11 layer know about the new noise floor */
|
|
|
|
|
sc->sc_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
|
|
|
|
|
@@ -5720,25 +5721,7 @@
|
|
|
|
|
@@ -5714,25 +5715,7 @@
|
|
|
|
|
}
|
|
|
|
|
if (rs->rs_status & HAL_RXERR_MIC) {
|
|
|
|
|
sc->sc_stats.ast_rx_badmic++;
|
|
|
|
@ -37,7 +37,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c |
|
|
|
|
}
|
|
|
|
|
/*
|
|
|
|
|
* Reject error frames if we have no vaps that
|
|
|
|
|
@@ -5802,8 +5785,9 @@
|
|
|
|
|
@@ -5796,8 +5779,9 @@
|
|
|
|
|
/*
|
|
|
|
|
* Finished monitor mode handling, now reject
|
|
|
|
|
* error frames before passing to other vaps
|
|
|
|
@ -48,7 +48,7 @@ Index: madwifi-ng-r2525-20070630/ath/if_ath.c |
|
|
|
|
dev_kfree_skb(skb);
|
|
|
|
|
skb = NULL;
|
|
|
|
|
goto rx_next;
|
|
|
|
|
@@ -5834,6 +5818,27 @@
|
|
|
|
|
@@ -5828,6 +5812,27 @@
|
|
|
|
|
sc->sc_hwmap[rs->rs_rate].ieeerate,
|
|
|
|
|
rs->rs_rssi);
|
|
|
|
|
|
|
|
|
@ -76,10 +76,10 @@ Index: madwifi-ng-r2525-20070630/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-r2525-20070630/net80211/ieee80211_crypto_ccmp.c
|
|
|
|
|
Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- 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
|
|
|
|
|
--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_ccmp.c 2007-07-11 22:59:43.580332047 +0200
|
|
|
|
|
+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c 2007-07-11 22:59:46.020471102 +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);
|
|
|
|
@ -98,10 +98,10 @@ Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_ccmp.c |
|
|
|
|
{
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto.h
|
|
|
|
|
Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- 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
|
|
|
|
|
--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto.h 2007-07-11 22:59:37.880007204 +0200
|
|
|
|
|
+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h 2007-07-11 22:59:46.060473383 +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-r2525-20070630/net80211/ieee80211_crypto.h |
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_none.c
|
|
|
|
|
Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- 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
|
|
|
|
|
--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_none.c 2007-07-11 22:59:37.888007663 +0200
|
|
|
|
|
+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c 2007-07-11 22:59:46.084474751 +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-r2525-20070630/net80211/ieee80211_crypto_none.c |
|
|
|
|
{
|
|
|
|
|
struct ieee80211vap *vap = k->wk_private;
|
|
|
|
|
|
|
|
|
|
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_tkip.c
|
|
|
|
|
Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- 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
|
|
|
|
|
--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_tkip.c 2007-07-11 22:59:37.896008115 +0200
|
|
|
|
|
+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c 2007-07-11 22:59:46.112476346 +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-r2525-20070630/net80211/ieee80211_crypto_tkip.c |
|
|
|
|
struct ieee80211vap *vap = ctx->tc_vap;
|
|
|
|
|
u8 mic[IEEE80211_WEP_MICLEN];
|
|
|
|
|
u8 mic0[IEEE80211_WEP_MICLEN];
|
|
|
|
|
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_crypto_wep.c
|
|
|
|
|
Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- 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
|
|
|
|
|
--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_wep.c 2007-07-11 22:59:37.900008344 +0200
|
|
|
|
|
+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c 2007-07-11 22:59:46.136477715 +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-r2525-20070630/net80211/ieee80211_crypto_wep.c |
|
|
|
|
{
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_input.c
|
|
|
|
|
Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- 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
|
|
|
|
|
--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c 2007-07-11 22:59:45.608447623 +0200
|
|
|
|
|
+++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c 2007-07-11 22:59:46.180480221 +0200
|
|
|
|
|
@@ -632,7 +632,7 @@
|
|
|
|
|
* Next strip any MSDU crypto bits.
|
|
|
|
|
*/
|
|
|
|
@ -212,7 +212,7 @@ Index: madwifi-ng-r2525-20070630/net80211/ieee80211_input.c |
|
|
|
|
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
|
|
|
|
|
ni->ni_macaddr, "data", "%s", "demic error");
|
|
|
|
|
IEEE80211_NODE_STAT(ni, rx_demicfail);
|
|
|
|
|
@@ -3771,6 +3771,47 @@
|
|
|
|
|
@@ -3772,6 +3772,47 @@
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
@ -260,10 +260,10 @@ Index: madwifi-ng-r2525-20070630/net80211/ieee80211_input.c |
|
|
|
|
#ifdef IEEE80211_DEBUG
|
|
|
|
|
/*
|
|
|
|
|
* Debugging support.
|
|
|
|
|
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_proto.h
|
|
|
|
|
Index: madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- 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
|
|
|
|
|
--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_proto.h 2007-07-11 22:59:37.916009256 +0200
|
|
|
|
|
+++ madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h 2007-07-11 22:59:46.204481592 +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-r2525-20070630/net80211/ieee80211_proto.h |
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Return the size of the 802.11 header for a management or data frame.
|
|
|
|
|
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_linux.c
|
|
|
|
|
Index: madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- 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
|
|
|
|
|
--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_linux.c 2007-07-11 22:59:43.336318141 +0200
|
|
|
|
|
+++ madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c 2007-07-11 22:59:46.228482956 +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,10 +287,10 @@ Index: madwifi-ng-r2525-20070630/net80211/ieee80211_linux.c |
|
|
|
|
memset(&wrqu, 0, sizeof(wrqu));
|
|
|
|
|
wrqu.data.length = strlen(buf);
|
|
|
|
|
wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
|
|
|
|
|
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_output.c
|
|
|
|
|
Index: madwifi-ng-r2568-20070710/net80211/ieee80211_output.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- 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
|
|
|
|
|
--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_output.c 2007-07-11 22:59:37.928009938 +0200
|
|
|
|
|
+++ madwifi-ng-r2568-20070710/net80211/ieee80211_output.c 2007-07-11 22:59:46.252484325 +0200
|
|
|
|
|
@@ -1079,13 +1079,16 @@
|
|
|
|
|
cip = (struct ieee80211_cipher *) key->wk_cipher;
|
|
|
|
|
ciphdrsize = cip->ic_header;
|
|
|
|
@ -311,10 +311,10 @@ Index: madwifi-ng-r2525-20070630/net80211/ieee80211_output.c |
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Allocate sk_buff for each subsequent fragment; First fragment
|
|
|
|
|
Index: madwifi-ng-r2525-20070630/net80211/ieee80211_node.c
|
|
|
|
|
Index: madwifi-ng-r2568-20070710/net80211/ieee80211_node.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- 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
|
|
|
|
|
--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.c 2007-07-11 22:59:45.632448994 +0200
|
|
|
|
|
+++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c 2007-07-11 22:59:46.304487289 +0200
|
|
|
|
|
@@ -1891,11 +1891,13 @@
|
|
|
|
|
/* From this point onwards we can no longer find the node,
|
|
|
|
|
* so no more references are generated
|
|
|
|
|