From: Felix Fietkau Date: Sat, 22 Dec 2007 16:17:17 +0000 (+0000) Subject: sync with madwifi changeset 3070 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e86049efe8542d787f7c363f90371f8902fc705e;p=librecmc%2Flibrecmc.git sync with madwifi changeset 3070 SVN-Revision: 9835 --- diff --git a/package/madwifi/patches/110-minstrel_counters.patch b/package/madwifi/patches/110-minstrel_counters.patch index a3ed91a522..7e0b46b67a 100644 --- a/package/madwifi/patches/110-minstrel_counters.patch +++ b/package/madwifi/patches/110-minstrel_counters.patch @@ -1,7 +1,8 @@ -diff --exclude '*~' -uNr madwifi-dfs-r3053.orig/ath_rate/minstrel/minstrel.c madwifi-dfs-r3053/ath_rate/minstrel/minstrel.c ---- madwifi-dfs-r3053.orig/ath_rate/minstrel/minstrel.c 2007-12-21 13:34:23.000000000 +0000 -+++ madwifi-dfs-r3053/ath_rate/minstrel/minstrel.c 2007-12-21 14:29:07.000000000 +0000 -@@ -449,7 +449,6 @@ +Index: trunk/ath_rate/minstrel/minstrel.c +=================================================================== +--- trunk/ath_rate/minstrel/minstrel.c (revision 3065) ++++ trunk/ath_rate/minstrel/minstrel.c (working copy) +@@ -446,7 +446,6 @@ const struct ath_desc *ds = &bf->bf_desc[0]; int final_rate = 0; int tries = 0; @@ -9,14 +10,14 @@ diff --exclude '*~' -uNr madwifi-dfs-r3053.orig/ath_rate/minstrel/minstrel.c mad int mrr; int final_ndx; int rate0, tries0, ndx0; -@@ -488,8 +487,8 @@ +@@ -485,8 +484,8 @@ mrr = sc->sc_mrretry && !(ic->ic_flags & IEEE80211_F_USEPROT) && ENABLE_MRR; if (!mrr) { - if ((0 <= ndx) && (ndx < sn->num_rates)) { - sn->rs_rateattempts[ndx]++; /* only one rate was used */ + if ((0 <= final_ndx) && (final_ndx < sn->num_rates)) { -+ sn->rs_rateattempts[final_ndx]++; /* only one rate was used */ ++ sn->rs_rateattempts[final_ndx] += tries; /* only one rate was used */ } return; }