mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
upgrade madwifi to r2756
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9422 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
Index: madwifi-ng-r2568-20070710/ath/if_ath.c
|
||||
Index: madwifi-ng-r2756-20071018/ath/if_ath.c
|
||||
===================================================================
|
||||
--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-10-20 20:52:09.000000000 +0200
|
||||
+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-10-20 20:52:37.000000000 +0200
|
||||
@@ -3387,7 +3387,9 @@
|
||||
--- madwifi-ng-r2756-20071018.orig/ath/if_ath.c 2007-10-24 06:20:20.997885880 +0200
|
||||
+++ madwifi-ng-r2756-20071018/ath/if_ath.c 2007-10-24 06:20:21.225898872 +0200
|
||||
@@ -3519,7 +3519,9 @@
|
||||
rfilt |= HAL_RX_FILTER_PROM;
|
||||
if (ic->ic_opmode == IEEE80211_M_STA ||
|
||||
sc->sc_opmode == HAL_M_IBSS || /* NB: AHDEMO too */
|
||||
@@ -13,10 +13,10 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c
|
||||
rfilt |= HAL_RX_FILTER_BEACON;
|
||||
if ((sc->sc_nmonvaps > 0) || ((sc->sc_nvaps > 0) && (sc->sc_nibssvaps > 0)))
|
||||
rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
|
||||
Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c
|
||||
Index: madwifi-ng-r2756-20071018/net80211/ieee80211_input.c
|
||||
===================================================================
|
||||
--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c 2007-10-20 20:52:09.000000000 +0200
|
||||
+++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c 2007-10-20 20:52:34.000000000 +0200
|
||||
--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_input.c 2007-10-24 06:20:20.757872202 +0200
|
||||
+++ madwifi-ng-r2756-20071018/net80211/ieee80211_input.c 2007-10-24 06:20:21.229899101 +0200
|
||||
@@ -321,11 +321,12 @@
|
||||
bssid = wh->i_addr3;
|
||||
}
|
||||
@@ -42,7 +42,7 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c
|
||||
/* not interested in */
|
||||
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
|
||||
bssid, NULL, "%s", "not to bss");
|
||||
@@ -2541,7 +2543,7 @@
|
||||
@@ -2550,7 +2552,7 @@
|
||||
u_int8_t *frm, *efrm;
|
||||
u_int8_t *ssid, *rates, *xrates, *wpa, *rsn, *wme, *ath;
|
||||
u_int8_t rate;
|
||||
@@ -51,7 +51,7 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c
|
||||
u_int8_t qosinfo;
|
||||
|
||||
wh = (struct ieee80211_frame *) skb->data;
|
||||
@@ -2563,11 +2565,15 @@
|
||||
@@ -2572,11 +2574,15 @@
|
||||
* o station mode when associated (to collect state
|
||||
* updates such as 802.11g slot time), or
|
||||
* o adhoc mode (to discover neighbors)
|
||||
@@ -68,7 +68,7 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c
|
||||
vap->iv_stats.is_rx_mgtdiscard++;
|
||||
return;
|
||||
}
|
||||
@@ -2650,6 +2656,7 @@
|
||||
@@ -2659,6 +2665,7 @@
|
||||
break;
|
||||
}
|
||||
scan.erp = frm[2];
|
||||
@@ -76,7 +76,7 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c
|
||||
break;
|
||||
case IEEE80211_ELEMID_RSN:
|
||||
scan.rsn = frm;
|
||||
@@ -2867,6 +2874,20 @@
|
||||
@@ -2876,6 +2883,20 @@
|
||||
ieee80211_bg_scan(vap);
|
||||
return;
|
||||
}
|
||||
@@ -97,10 +97,10 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c
|
||||
/*
|
||||
* If scanning, just pass information to the scan module.
|
||||
*/
|
||||
Index: madwifi-ng-r2568-20070710/net80211/ieee80211_node.c
|
||||
Index: madwifi-ng-r2756-20071018/net80211/ieee80211_node.c
|
||||
===================================================================
|
||||
--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.c 2007-10-20 20:52:09.000000000 +0200
|
||||
+++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c 2007-10-20 20:52:34.000000000 +0200
|
||||
--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_node.c 2007-10-24 06:20:19.113778513 +0200
|
||||
+++ madwifi-ng-r2756-20071018/net80211/ieee80211_node.c 2007-10-24 06:20:21.237899558 +0200
|
||||
@@ -332,10 +332,16 @@
|
||||
/* Update country ie information */
|
||||
ieee80211_build_countryie(ic);
|
||||
@@ -120,10 +120,10 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_node.c
|
||||
|
||||
(void) ieee80211_sta_join1(PASS_NODE(ni));
|
||||
}
|
||||
Index: madwifi-ng-r2568-20070710/net80211/ieee80211_proto.c
|
||||
Index: madwifi-ng-r2756-20071018/net80211/ieee80211_proto.c
|
||||
===================================================================
|
||||
--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_proto.c 2007-10-20 20:52:09.000000000 +0200
|
||||
+++ madwifi-ng-r2568-20070710/net80211/ieee80211_proto.c 2007-10-20 20:52:09.000000000 +0200
|
||||
--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_proto.c 2007-10-24 06:20:16.117607766 +0200
|
||||
+++ madwifi-ng-r2756-20071018/net80211/ieee80211_proto.c 2007-10-24 06:20:21.237899558 +0200
|
||||
@@ -586,6 +586,28 @@
|
||||
{ 4, { 2, 4, 11, 22 } }, /* IEEE80211_MODE_TURBO_G (mixed b/g) */
|
||||
};
|
||||
@@ -153,10 +153,10 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_proto.c
|
||||
/*
|
||||
* Mark the basic rates for the 11g rate table based on the
|
||||
* specified mode. For 11b compatibility we mark only 11b
|
||||
Index: madwifi-ng-r2568-20070710/net80211/ieee80211_var.h
|
||||
Index: madwifi-ng-r2756-20071018/net80211/ieee80211_var.h
|
||||
===================================================================
|
||||
--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_var.h 2007-10-20 20:52:09.000000000 +0200
|
||||
+++ madwifi-ng-r2568-20070710/net80211/ieee80211_var.h 2007-10-20 20:52:09.000000000 +0200
|
||||
--- madwifi-ng-r2756-20071018.orig/net80211/ieee80211_var.h 2007-10-24 06:20:20.453854879 +0200
|
||||
+++ madwifi-ng-r2756-20071018/net80211/ieee80211_var.h 2007-10-24 06:20:21.237899558 +0200
|
||||
@@ -592,6 +592,8 @@
|
||||
void ieee80211_build_countryie(struct ieee80211com *);
|
||||
int ieee80211_media_setup(struct ieee80211com *, struct ifmedia *, u_int32_t,
|
||||
|
||||
Reference in New Issue
Block a user