|
|
|
@ -1,7 +1,7 @@ |
|
|
|
|
Index: madwifi-ng-r2756-20071018/ath/if_ath.c
|
|
|
|
|
Index: madwifi-ng-r2799-20071030/ath/if_ath.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- madwifi-ng-r2756-20071018.orig/ath/if_ath.c 2007-10-24 06:20:21.225898872 +0200
|
|
|
|
|
+++ madwifi-ng-r2756-20071018/ath/if_ath.c 2007-10-24 06:20:21.505914829 +0200
|
|
|
|
|
--- madwifi-ng-r2799-20071030.orig/ath/if_ath.c 2007-10-31 14:04:51.797573253 +0100
|
|
|
|
|
+++ madwifi-ng-r2799-20071030/ath/if_ath.c 2007-10-31 14:04:52.073588984 +0100
|
|
|
|
|
@@ -5743,6 +5743,7 @@
|
|
|
|
|
u_int64_t rs_tsf;
|
|
|
|
|
u_int processed = 0, early_stop = 0;
|
|
|
|
@ -75,10 +75,10 @@ Index: madwifi-ng-r2756-20071018/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-r2756-20071018/net80211/ieee80211_crypto_ccmp.c
|
|
|
|
|
Index: madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_ccmp.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_crypto_ccmp.c 2007-10-24 06:20:19.581805179 +0200
|
|
|
|
|
+++ madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_ccmp.c 2007-10-24 06:20:21.505914829 +0200
|
|
|
|
|
--- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_crypto_ccmp.c 2007-10-31 14:04:49.913465886 +0100
|
|
|
|
|
+++ madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_ccmp.c 2007-10-31 14:04:52.073588984 +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);
|
|
|
|
@ -97,10 +97,10 @@ Index: madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_ccmp.c |
|
|
|
|
{
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
Index: madwifi-ng-r2756-20071018/net80211/ieee80211_crypto.h
|
|
|
|
|
Index: madwifi-ng-r2799-20071030/net80211/ieee80211_crypto.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_crypto.h 2007-10-24 06:20:16.013601842 +0200
|
|
|
|
|
+++ madwifi-ng-r2756-20071018/net80211/ieee80211_crypto.h 2007-10-24 06:20:21.513915288 +0200
|
|
|
|
|
--- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_crypto.h 2007-10-31 14:04:46.109249096 +0100
|
|
|
|
|
+++ madwifi-ng-r2799-20071030/net80211/ieee80211_crypto.h 2007-10-31 14:04:52.073588984 +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);
|
|
|
|
@ -123,10 +123,10 @@ Index: madwifi-ng-r2756-20071018/net80211/ieee80211_crypto.h |
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Index: madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_none.c
|
|
|
|
|
Index: madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_none.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_crypto_none.c 2007-10-24 06:20:16.017602067 +0200
|
|
|
|
|
+++ madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_none.c 2007-10-24 06:20:21.513915288 +0200
|
|
|
|
|
--- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_crypto_none.c 2007-10-31 14:04:46.113249322 +0100
|
|
|
|
|
+++ madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_none.c 2007-10-31 14:04:52.073588984 +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);
|
|
|
|
@ -145,10 +145,10 @@ Index: madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_none.c |
|
|
|
|
{
|
|
|
|
|
struct ieee80211vap *vap = k->wk_private;
|
|
|
|
|
|
|
|
|
|
Index: madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_tkip.c
|
|
|
|
|
Index: madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_tkip.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_crypto_tkip.c 2007-10-24 06:20:16.025602525 +0200
|
|
|
|
|
+++ madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_tkip.c 2007-10-24 06:20:21.513915288 +0200
|
|
|
|
|
--- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_crypto_tkip.c 2007-10-31 14:04:46.121249780 +0100
|
|
|
|
|
+++ madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_tkip.c 2007-10-31 14:04:52.077589210 +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);
|
|
|
|
@ -176,10 +176,10 @@ Index: madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_tkip.c |
|
|
|
|
struct ieee80211vap *vap = ctx->tc_vap;
|
|
|
|
|
u8 mic[IEEE80211_WEP_MICLEN];
|
|
|
|
|
u8 mic0[IEEE80211_WEP_MICLEN];
|
|
|
|
|
Index: madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_wep.c
|
|
|
|
|
Index: madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_wep.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_crypto_wep.c 2007-10-24 06:20:16.033602982 +0200
|
|
|
|
|
+++ madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_wep.c 2007-10-24 06:20:21.513915288 +0200
|
|
|
|
|
--- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_crypto_wep.c 2007-10-31 14:04:46.129250236 +0100
|
|
|
|
|
+++ madwifi-ng-r2799-20071030/net80211/ieee80211_crypto_wep.c 2007-10-31 14:04:52.077589210 +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);
|
|
|
|
@ -198,10 +198,10 @@ Index: madwifi-ng-r2756-20071018/net80211/ieee80211_crypto_wep.c |
|
|
|
|
{
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
Index: madwifi-ng-r2756-20071018/net80211/ieee80211_input.c
|
|
|
|
|
Index: madwifi-ng-r2799-20071030/net80211/ieee80211_input.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_input.c 2007-10-24 06:20:21.229899101 +0200
|
|
|
|
|
+++ madwifi-ng-r2756-20071018/net80211/ieee80211_input.c 2007-10-24 06:20:21.517915515 +0200
|
|
|
|
|
--- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_input.c 2007-10-31 14:04:51.801573482 +0100
|
|
|
|
|
+++ madwifi-ng-r2799-20071030/net80211/ieee80211_input.c 2007-10-31 14:04:52.081589439 +0100
|
|
|
|
|
@@ -632,7 +632,7 @@
|
|
|
|
|
* Next strip any MSDU crypto bits.
|
|
|
|
|
*/
|
|
|
|
@ -259,10 +259,10 @@ Index: madwifi-ng-r2756-20071018/net80211/ieee80211_input.c |
|
|
|
|
#ifdef IEEE80211_DEBUG
|
|
|
|
|
/*
|
|
|
|
|
* Debugging support.
|
|
|
|
|
Index: madwifi-ng-r2756-20071018/net80211/ieee80211_proto.h
|
|
|
|
|
Index: madwifi-ng-r2799-20071030/net80211/ieee80211_proto.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_proto.h 2007-10-24 06:20:16.045603664 +0200
|
|
|
|
|
+++ madwifi-ng-r2756-20071018/net80211/ieee80211_proto.h 2007-10-24 06:20:21.517915515 +0200
|
|
|
|
|
--- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_proto.h 2007-10-31 14:04:46.141250920 +0100
|
|
|
|
|
+++ madwifi-ng-r2799-20071030/net80211/ieee80211_proto.h 2007-10-31 14:04:52.081589439 +0100
|
|
|
|
|
@@ -91,6 +91,7 @@
|
|
|
|
|
void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode);
|
|
|
|
|
enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *);
|
|
|
|
@ -271,10 +271,10 @@ Index: madwifi-ng-r2756-20071018/net80211/ieee80211_proto.h |
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Return the size of the 802.11 header for a management or data frame.
|
|
|
|
|
Index: madwifi-ng-r2756-20071018/net80211/ieee80211_linux.c
|
|
|
|
|
Index: madwifi-ng-r2799-20071030/net80211/ieee80211_linux.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_linux.c 2007-10-24 06:20:19.373793330 +0200
|
|
|
|
|
+++ madwifi-ng-r2756-20071018/net80211/ieee80211_linux.c 2007-10-24 06:20:21.517915515 +0200
|
|
|
|
|
--- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_linux.c 2007-10-31 14:04:49.705454030 +0100
|
|
|
|
|
+++ madwifi-ng-r2799-20071030/net80211/ieee80211_linux.c 2007-10-31 14:04:52.081589439 +0100
|
|
|
|
|
@@ -339,8 +339,8 @@
|
|
|
|
|
/* TODO: needed parameters: count, keyid, key type, src address, TSC */
|
|
|
|
|
snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag,
|
|
|
|
@ -286,10 +286,10 @@ Index: madwifi-ng-r2756-20071018/net80211/ieee80211_linux.c |
|
|
|
|
memset(&wrqu, 0, sizeof(wrqu));
|
|
|
|
|
wrqu.data.length = strlen(buf);
|
|
|
|
|
wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
|
|
|
|
|
Index: madwifi-ng-r2756-20071018/net80211/ieee80211_output.c
|
|
|
|
|
Index: madwifi-ng-r2799-20071030/net80211/ieee80211_output.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_output.c 2007-10-24 06:20:16.061604575 +0200
|
|
|
|
|
+++ madwifi-ng-r2756-20071018/net80211/ieee80211_output.c 2007-10-24 06:20:21.521915740 +0200
|
|
|
|
|
--- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_output.c 2007-10-31 14:04:46.157251830 +0100
|
|
|
|
|
+++ madwifi-ng-r2799-20071030/net80211/ieee80211_output.c 2007-10-31 14:04:52.081589439 +0100
|
|
|
|
|
@@ -1079,13 +1079,16 @@
|
|
|
|
|
cip = (struct ieee80211_cipher *) key->wk_cipher;
|
|
|
|
|
ciphdrsize = cip->ic_header;
|
|
|
|
@ -310,11 +310,11 @@ Index: madwifi-ng-r2756-20071018/net80211/ieee80211_output.c |
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Allocate sk_buff for each subsequent fragment; First fragment
|
|
|
|
|
Index: madwifi-ng-r2756-20071018/net80211/ieee80211_node.c
|
|
|
|
|
Index: madwifi-ng-r2799-20071030/net80211/ieee80211_node.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_node.c 2007-10-24 06:20:21.237899558 +0200
|
|
|
|
|
+++ madwifi-ng-r2756-20071018/net80211/ieee80211_node.c 2007-10-24 06:20:21.521915740 +0200
|
|
|
|
|
@@ -1880,11 +1880,13 @@
|
|
|
|
|
--- madwifi-ng-r2799-20071030.orig/net80211/ieee80211_node.c 2007-10-31 14:04:51.805573711 +0100
|
|
|
|
|
+++ madwifi-ng-r2799-20071030/net80211/ieee80211_node.c 2007-10-31 14:04:52.085589669 +0100
|
|
|
|
|
@@ -1884,11 +1884,13 @@
|
|
|
|
|
/* From this point onwards we can no longer find the node,
|
|
|
|
|
* so no more references are generated
|
|
|
|
|
*/
|
|
|
|
|