X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/e84fbded9840e445b7cb9f74b5a1ed80440a3f33..31a40f97ef54e10e2b3dc3cacb9cff436657c586:/package/madwifi/patches/305-pureg_fix.patch?ds=inline

diff --git a/package/madwifi/patches/305-pureg_fix.patch b/package/madwifi/patches/305-pureg_fix.patch
index cbe98e0ca..8adb8a716 100644
--- a/package/madwifi/patches/305-pureg_fix.patch
+++ b/package/madwifi/patches/305-pureg_fix.patch
@@ -1,7 +1,6 @@
-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.426654472 +0200
-+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c	2007-05-26 18:51:09.440652344 +0200
-@@ -3383,7 +3383,9 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -4158,7 +4158,9 @@ ath_calcrxfilter(struct ath_softc *sc)
  		rfilt |= HAL_RX_FILTER_PROM;
  	if (ic->ic_opmode == IEEE80211_M_STA ||
  	    sc->sc_opmode == HAL_M_IBSS ||	/* NB: AHDEMO too */
@@ -10,52 +9,62 @@ diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.d
 +		((ic->ic_opmode == IEEE80211_M_HOSTAP) &&
 +		 (ic->ic_protmode != IEEE80211_PROT_NONE)))
  		rfilt |= HAL_RX_FILTER_BEACON;
- 	if (sc->sc_nmonvaps > 0) 
- 		rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON | 
-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.429654016 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_input.c	2007-05-26 18:51:09.443651888 +0200
-@@ -343,11 +343,12 @@
+ 	if (sc->sc_nmonvaps > 0)
+ 		rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
+@@ -346,11 +346,12 @@ ieee80211_input(struct ieee80211vap * va
  				bssid = wh->i_addr3;
  			}
  			/*
 -			 * Validate the bssid.
 +			 * Validate the bssid. Let beacons get through though for 11g protection mode.
  			 */
- #ifdef ATH_SUPERG_XR
- 			if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) &&
+-#ifdef ATH_SUPERG_XR
+ 			if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bssid) &&
 -			    !IEEE80211_ADDR_EQ(bssid, dev->broadcast)) {
 +			    !IEEE80211_ADDR_EQ(bssid, dev->broadcast) &&
 +				(subtype != IEEE80211_FC0_SUBTYPE_BEACON)) {
++#ifdef ATH_SUPERG_XR
  				/*
  				 * allow MGT frames to vap->iv_xrvap.
  				 * this will allow roaming between  XR and normal vaps
-@@ -366,7 +367,8 @@
- 			}
+@@ -366,18 +367,14 @@ ieee80211_input(struct ieee80211vap * va
+ 					vap->iv_stats.is_rx_wrongbss++;
+ 					goto out;
+ 				}
+-			}
  #else
- 			if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) &&
+-			if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bssid) &&
 -			    !IEEE80211_ADDR_EQ(bssid, dev->broadcast)) {
-+			    !IEEE80211_ADDR_EQ(bssid, dev->broadcast) &&
-+				(subtype != IEEE80211_FC0_SUBTYPE_BEACON)) {
  				/* not interested in */
  				IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
  					bssid, NULL, "%s", "not to bss");
-@@ -2593,7 +2595,7 @@
+ 				vap->iv_stats.is_rx_wrongbss++;
+ 				goto out;
+-			}
+-
+ #endif
++			}
+ 			break;
+ 		case IEEE80211_M_WDS:
+ 			if (skb->len < sizeof(struct ieee80211_frame_addr4)) {
+@@ -3066,7 +3063,7 @@ ieee80211_recv_mgmt(struct ieee80211vap
  	u_int8_t *frm, *efrm;
- 	u_int8_t *ssid, *rates, *xrates, *wpa, *rsn, *wme, *ath;
+ 	u_int8_t *ssid, *rates, *xrates, *suppchan, *wpa, *rsn, *wme, *ath;
  	u_int8_t rate;
 -	int reassoc, resp, allocbs = 0;
 +	int reassoc, resp, allocbs = 0, has_erp = 0;
  	u_int8_t qosinfo;
  
- 	wh = (struct ieee80211_frame *) skb->data;
-@@ -2615,11 +2617,15 @@
+ 	if (ni_or_null == NULL)
+@@ -3096,11 +3093,15 @@ ieee80211_recv_mgmt(struct ieee80211vap
  		 *    o station mode when associated (to collect state
  		 *      updates such as 802.11g slot time), or
  		 *    o adhoc mode (to discover neighbors)
 +		 *    o ap mode in protection mode (beacons only)
  		 * Frames otherwise received are discarded.
- 		 */ 
+ 		 */
  		if (!((ic->ic_flags & IEEE80211_F_SCAN) ||
  		    (vap->iv_opmode == IEEE80211_M_STA && ni->ni_associd) ||
 -		    vap->iv_opmode == IEEE80211_M_IBSS)) {
@@ -66,7 +75,7 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2
  			vap->iv_stats.is_rx_mgtdiscard++;
  			return;
  		}
-@@ -2702,6 +2708,7 @@
+@@ -3184,6 +3185,7 @@ ieee80211_recv_mgmt(struct ieee80211vap
  					break;
  				}
  				scan.erp = frm[2];
@@ -74,16 +83,7 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2
  				break;
  			case IEEE80211_ELEMID_RSN:
  				scan.rsn = frm;
-@@ -2855,7 +2862,7 @@
- 			    vap->iv_flags_ext & IEEE80211_FEXT_SWBMISS) {
- 				mod_timer(&vap->iv_swbmiss, jiffies + vap->iv_swbmiss_period);
- 			}
--			
-+
- 			/*
- 			 * If scanning, pass the info to the scan module.
- 			 * Otherwise, check if it's the right time to do
-@@ -2877,6 +2884,20 @@
+@@ -3421,6 +3423,20 @@ ieee80211_recv_mgmt(struct ieee80211vap
  				ieee80211_bg_scan(vap);
  			return;
  		}
@@ -91,11 +91,11 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2
 +		/* Update AP protection mode when in 11G mode */
 +		if ((vap->iv_opmode == IEEE80211_M_HOSTAP) &&
 +			IEEE80211_IS_CHAN_ANYG(ic->ic_curchan)) {
-+				
++
 +			/* Assume no ERP IE == 11b AP */
 +			if ((!has_erp || (has_erp && (scan.erp & IEEE80211_ERP_NON_ERP_PRESENT))) &&
 +				!(ic->ic_flags & IEEE80211_F_USEPROT)) {
-+				
++
 +				ic->ic_flags |= IEEE80211_F_USEPROT;
 +				ic->ic_flags_ext |= IEEE80211_FEXT_ERPUPDATE;
 +			}
@@ -104,10 +104,9 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2
  		/*
  		 * If scanning, just pass information to the scan module.
  		 */
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_node.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.c	2007-05-26 18:51:09.430653864 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_node.c	2007-05-26 18:51:09.444651736 +0200
-@@ -332,10 +332,16 @@
+--- a/net80211/ieee80211_node.c
++++ b/net80211/ieee80211_node.c
+@@ -383,10 +383,16 @@ ieee80211_create_ibss(struct ieee80211va
  	/* Update country ie information */
  	ieee80211_build_countryie(ic);
  
@@ -121,16 +120,15 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.c madwifi-ng-r23
 +
 +	if ((vap->iv_flags & IEEE80211_F_PUREG) &&
 +		IEEE80211_IS_CHAN_ANYG(chan)) {
-+		ieee80211_setpuregbasicrates(&ni->ni_rates); 
++		ieee80211_setpuregbasicrates(&ni->ni_rates);
 +	}
  
  	(void) ieee80211_sta_join1(PASS_NODE(ni));
  }
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.c
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c	2007-05-26 18:51:09.431653712 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.c	2007-05-26 18:51:09.445651584 +0200
-@@ -586,6 +586,28 @@
-     { 4, { 2, 4, 11, 22 } },	/* IEEE80211_MODE_TURBO_G (mixed b/g) */
+--- a/net80211/ieee80211_proto.c
++++ b/net80211/ieee80211_proto.c
+@@ -595,6 +595,28 @@ static const struct ieee80211_rateset ba
+ 	{ 4, { 2, 4, 11, 22 } },	/* IEEE80211_MODE_TURBO_G (mixed b/g) */
  };
  
 +static const struct ieee80211_rateset basicpureg[] = {
@@ -158,15 +156,13 @@ diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c madwifi-ng-r2
  /*
   * Mark the basic rates for the 11g rate table based on the
   * specified mode.  For 11b compatibility we mark only 11b
-diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_var.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_var.h
---- madwifi-ng-r2377-20070526.old/net80211/ieee80211_var.h	2007-05-26 18:51:09.321670432 +0200
-+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_var.h	2007-05-26 18:51:09.445651584 +0200
-@@ -584,6 +584,8 @@
- void ieee80211_build_countryie(struct ieee80211com *);
- int ieee80211_media_setup(struct ieee80211com *, struct ifmedia *, u_int32_t,
- 	ifm_change_cb_t, ifm_stat_cb_t);
+--- a/net80211/ieee80211_var.h
++++ b/net80211/ieee80211_var.h
+@@ -708,6 +708,7 @@ int ieee80211_media_setup(struct ieee802
+ void ieee80211_build_sc_ie(struct ieee80211com *);
+ void ieee80211_dfs_action(struct ieee80211com *);
+ void ieee80211_expire_channel_excl_restrictions(struct ieee80211com *);
 +void ieee80211_setpuregbasicrates(struct ieee80211_rateset *rs);
-+		
  
- /* Key update synchronization methods.  XXX should not be visible. */
- static __inline void
+ /*
+  * Iterate through ic_channels to enumerate all distinct ic_ieee channel numbers.