cpmac fix (closes #3124)
[openwrt-10.03/.git] / package / madwifi / patches / 318-minstrel_mrr.patch
1 Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
2 ===================================================================
3 --- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c       2008-02-20 18:10:48.795295077 +0100
4 +++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c    2008-02-20 18:10:50.951417946 +0100
5 @@ -328,7 +328,7 @@
6                             return;
7                 }
8  
9 -               mrr = sc->sc_mrretry && !(ic->ic_flags & IEEE80211_F_USEPROT) && ENABLE_MRR;
10 +               mrr = sc->sc_mrretry && ENABLE_MRR;
11  
12                 if (sn->static_rate_ndx >= 0) {
13                             ndx = sn->static_rate_ndx;
14 @@ -486,7 +486,7 @@
15                 if (!ts->ts_status)  /* Success when sending a packet*/
16                         sn->rs_ratesuccess[final_ndx]++;
17  
18 -               mrr = sc->sc_mrretry && !(ic->ic_flags & IEEE80211_F_USEPROT) && ENABLE_MRR;
19 +               mrr = sc->sc_mrretry && ENABLE_MRR;
20  
21                 if (!mrr) {
22                         if ((0 <= final_ndx) && (final_ndx < sn->num_rates)) {