X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/70d07962470a238e6abee8416b2a21e25dc641ee..071f766b1ddbdd19a8c97ed2773e892c039a35d1:/package/madwifi/patches/345-minstrel_sampling.patch

diff --git a/package/madwifi/patches/345-minstrel_sampling.patch b/package/madwifi/patches/345-minstrel_sampling.patch
index 0d4ee9f0a..63fcb8a61 100644
--- a/package/madwifi/patches/345-minstrel_sampling.patch
+++ b/package/madwifi/patches/345-minstrel_sampling.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3314/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c
-+++ madwifi-trunk-r3314/ath/if_ath.c
-@@ -8094,6 +8094,7 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -8103,6 +8103,7 @@ ath_tx_start(struct net_device *dev, str
  		ath_hal_setupxtxdesc(sc->sc_ah, ds, mrr.rate1, mrr.retries1,
  				     mrr.rate2, mrr.retries2,
  				     mrr.rate3, mrr.retries3);
@@ -10,11 +8,9 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
  	}
  
  #ifndef ATH_SUPERG_FF
-Index: madwifi-trunk-r3314/ath/if_athvar.h
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_athvar.h
-+++ madwifi-trunk-r3314/ath/if_athvar.h
-@@ -446,6 +446,7 @@
+--- a/ath/if_athvar.h
++++ b/ath/if_athvar.h
+@@ -446,6 +446,7 @@ struct ath_buf {
  	u_int16_t bf_flags;				/* tx descriptor flags */
  	u_int64_t bf_tsf;
  	int16_t bf_channoise;
@@ -22,11 +18,9 @@ Index: madwifi-trunk-r3314/ath/if_athvar.h
  #ifdef ATH_SUPERG_FF
  	/* XXX: combine this with bf_skbaddr if it ever changes to accommodate
  	 *      multiple segments.
-Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c
-+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
-@@ -333,15 +333,19 @@
+--- a/ath_rate/minstrel/minstrel.c
++++ b/ath_rate/minstrel/minstrel.c
+@@ -333,15 +333,19 @@ ath_rate_findrate(struct ath_softc *sc,
  		if (sn->static_rate_ndx >= 0) {
  			    ndx = sn->static_rate_ndx;
  		} else {
@@ -47,7 +41,7 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
  				}
  
  				/* Don't look for slowest rate (i.e. slowest
-@@ -398,11 +402,14 @@
+@@ -398,11 +402,14 @@ ath_rate_get_mrr(struct ath_softc *sc, s
  		if (sn->num_rates <= 0)
  			return;
  
@@ -64,7 +58,7 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
  				rc1 = sn->max_tp_rate;
  		} else {
  			rc1 = sn->max_tp_rate2;
-@@ -525,6 +532,9 @@
+@@ -525,6 +532,9 @@ ath_rate_tx_complete(struct ath_softc *s
  		if (tries <= tries1)
  			return;
  
@@ -74,11 +68,9 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
  		if  (tries2 < 0)
  			return;
  		tries = tries - tries1;
-Index: madwifi-trunk-r3314/net80211/ieee80211_rate.h
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_rate.h
-+++ madwifi-trunk-r3314/net80211/ieee80211_rate.h
-@@ -87,6 +87,7 @@
+--- a/net80211/ieee80211_rate.h
++++ b/net80211/ieee80211_rate.h
+@@ -87,6 +87,7 @@ struct ieee80211_mrr {
  	int retries2;
  	int rate3;
  	int retries3;