simplify and fix adm5120 image building, fix broken FEATURES handling

[openwrt.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 cdf2fff..fb0f32a 100644 (file)
--- a/package/madwifi/patches/111-minstrel_crash.patch
+++ b/package/madwifi/patches/111-minstrel_crash.patch
@@ -1,9 +1,10 @@
-diff -urN madwifi-ng-r2377-20070526.old/ath_rate/minstrel/minstrel.c madwifi-ng-r2377-20070526.dev/ath_rate/minstrel/minstrel.c
---- madwifi-ng-r2377-20070526.old/ath_rate/minstrel/minstrel.c 2007-05-21 19:33:26.000000000 +0200
-+++ madwifi-ng-r2377-20070526.dev/ath_rate/minstrel/minstrel.c 2007-05-26 18:51:08.575783824 +0200
+Index: madwifi-ng-r2568-20070710/ath_rate/minstrel/minstrel.c
+===================================================================
+--- madwifi-ng-r2568-20070710.orig/ath_rate/minstrel/minstrel.c        2007-07-23 01:48:38.542176563 +0200
++++ madwifi-ng-r2568-20070710/ath_rate/minstrel/minstrel.c     2007-07-23 01:48:40.974315165 +0200

 @@ -388,6 +388,9 @@
 @@ -388,6 +388,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 */
                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 */

  
 +              if (sn->num_rates <= 0)
 +                      return;
  
 +              if (sn->num_rates <= 0)
 +                      return;


@@ -11,4 +12,3 @@ diff -urN madwifi-ng-r2377-20070526.old/ath_rate/minstrel/minstrel.c madwifi-ng-
                if (sn->is_sampling) {
                        rc1 = sn->max_tp_rate;
                        sn->is_sampling = 0;
                if (sn->is_sampling) {
                        rc1 = sn->max_tp_rate;
                        sn->is_sampling = 0;

-