sync 8.09 with changes from trunk

[openwrt/svn-archive/archive.git] / package / madwifi / patches / 111-minstrel_crash.patch

diff --git a/package/madwifi/patches/111-minstrel_crash.patch b/package/madwifi/patches/111-minstrel_crash.patch
index 1a6ec20b89bb74740b9bdaa646e693a4a285f05f..43998c3ee0162f3185b970c71cf1e90f144a4341 100644 (file)
--- a/package/madwifi/patches/111-minstrel_crash.patch
+++ b/package/madwifi/patches/111-minstrel_crash.patch
@@ -1,13 +1,12 @@
-diff -ur madwifi.old/ath_rate/minstrel/minstrel.c madwifi.dev/ath_rate/minstrel/minstrel.c
---- madwifi.old/ath_rate/minstrel/minstrel.c   2007-05-18 13:19:16.000000000 +0200
-+++ madwifi.dev/ath_rate/minstrel/minstrel.c   2007-05-21 09:38:03.102725008 +0200
-@@ -388,6 +388,9 @@
-       int rc1, rc2, rc3;         /* Index into the rate table, so for example, it is  0..11 */
-       int rixc1, rixc2, rixc3;   /* The actual bit rate used */
+--- a/ath_rate/minstrel/minstrel.c
++++ b/ath_rate/minstrel/minstrel.c
+@@ -393,6 +393,9 @@
+               struct minstrel_node *sn = ATH_NODE_MINSTREL(an);
+               int rc1, rc2, rc3;         /* Index into the rate table, so for example, it is  0..11 */
  
-+      if (sn->num_rates <= 0)
-+              return;
++              if (sn->num_rates <= 0)
++                      return;
 +
-       if (sn->is_sampling) {
-               rc1 = sn->max_tp_rate;
-               sn->is_sampling = 0;
+               if (sn->is_sampling) {
+                       sn->is_sampling = 0;
+                       if (sn->rs_sample_rate_slower)