X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/bcb54b392476cc18216aa9def60424e507d5cde1..1fc2b717c59f1ce91c385c443705aad5e77c08df:/package/madwifi/patches/305-pureg_fix.patch

diff --git a/package/madwifi/patches/305-pureg_fix.patch b/package/madwifi/patches/305-pureg_fix.patch
index c278cf2c3..231ab081a 100644
--- a/package/madwifi/patches/305-pureg_fix.patch
+++ b/package/madwifi/patches/305-pureg_fix.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3314/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c	2008-02-20 21:57:41.025078273 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c	2008-02-20 21:57:44.393270217 +0100
-@@ -4146,7 +4146,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 */
@@ -13,11 +11,9 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  		rfilt |= HAL_RX_FILTER_BEACON;
  	if (sc->sc_nmonvaps > 0)
  		rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
-Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c	2008-02-20 21:57:41.037078957 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_input.c	2008-02-20 21:57:44.401270672 +0100
-@@ -346,11 +346,12 @@
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
+@@ -346,11 +346,12 @@ ieee80211_input(struct ieee80211vap * va
  				bssid = wh->i_addr3;
  			}
  			/*
@@ -33,7 +29,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
  				/*
  				 * allow MGT frames to vap->iv_xrvap.
  				 * this will allow roaming between  XR and normal vaps
-@@ -366,18 +367,14 @@
+@@ -366,18 +367,14 @@ ieee80211_input(struct ieee80211vap * va
  					vap->iv_stats.is_rx_wrongbss++;
  					goto out;
  				}
@@ -53,7 +49,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
  			break;
  		case IEEE80211_M_WDS:
  			if (skb->len < sizeof(struct ieee80211_frame_addr4)) {
-@@ -3066,7 +3063,7 @@
+@@ -3066,7 +3063,7 @@ ieee80211_recv_mgmt(struct ieee80211vap 
  	u_int8_t *frm, *efrm;
  	u_int8_t *ssid, *rates, *xrates, *suppchan, *wpa, *rsn, *wme, *ath;
  	u_int8_t rate;
@@ -62,7 +58,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
  	u_int8_t qosinfo;
  
  	if (ni_or_null == NULL)
-@@ -3096,11 +3093,15 @@
+@@ -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)
@@ -79,7 +75,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
  			vap->iv_stats.is_rx_mgtdiscard++;
  			return;
  		}
-@@ -3184,6 +3185,7 @@
+@@ -3184,6 +3185,7 @@ ieee80211_recv_mgmt(struct ieee80211vap 
  					break;
  				}
  				scan.erp = frm[2];
@@ -87,7 +83,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
  				break;
  			case IEEE80211_ELEMID_RSN:
  				scan.rsn = frm;
-@@ -3421,6 +3423,20 @@
+@@ -3421,6 +3423,20 @@ ieee80211_recv_mgmt(struct ieee80211vap 
  				ieee80211_bg_scan(vap);
  			return;
  		}
@@ -108,11 +104,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
  		/*
  		 * If scanning, just pass information to the scan module.
  		 */
-Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c	2008-02-20 21:56:33.629237604 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_node.c	2008-02-20 21:57:44.409271127 +0100
-@@ -383,10 +383,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);
  
@@ -131,11 +125,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
  
  	(void) ieee80211_sta_join1(PASS_NODE(ni));
  }
-Index: madwifi-trunk-r3314/net80211/ieee80211_proto.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_proto.c	2008-02-20 21:56:33.633237829 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_proto.c	2008-02-20 21:57:44.413271357 +0100
-@@ -595,6 +595,28 @@
+--- 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) */
  };
  
@@ -164,11 +156,9 @@ Index: madwifi-trunk-r3314/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-trunk-r3314/net80211/ieee80211_var.h
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h	2008-02-20 21:56:33.645238517 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_var.h	2008-02-20 21:57:44.417271583 +0100
-@@ -707,6 +707,7 @@
+--- 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 *);