madwifi: add some extra sanity checking

[openwrt.git] / package / madwifi / patches / 341-minrate.patch

diff --git a/package/madwifi/patches/341-minrate.patch b/package/madwifi/patches/341-minrate.patch
index 1d5628c..1e75dde 100644 (file)
--- a/package/madwifi/patches/341-minrate.patch
+++ b/package/madwifi/patches/341-minrate.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3314/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c      2008-03-07 02:30:53.276363092 +0100
-+++ madwifi-trunk-r3314/ath/if_ath.c   2008-03-07 02:32:12.584882631 +0100
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
 @@ -1308,6 +1308,7 @@
        vap->iv_key_update_begin = ath_key_update_begin;
        vap->iv_key_update_end = ath_key_update_end;
@@ -10,10 +8,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
        if (sc->sc_default_ieee80211_debug) {
                /* User specified defaults for new VAPs were provided, so
                 * use those (only). */
-Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c      2008-03-07 02:30:53.276363092 +0100
-+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c   2008-03-07 02:32:12.584882631 +0100
+--- a/ath_rate/minstrel/minstrel.c
++++ b/ath_rate/minstrel/minstrel.c
 @@ -638,9 +638,15 @@
                        sn->rs_succ_hist        [x] = 0;
                        sn->rs_att_hist         [x] = 0;
@@ -40,10 +36,8 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
                }
  
                ath_fill_sample_table(sn);
-Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c  2008-03-07 02:30:53.280363321 +0100
-+++ madwifi-trunk-r3314/ath_rate/sample/sample.c       2008-03-07 02:32:12.596883312 +0100
+--- a/ath_rate/sample/sample.c
++++ b/ath_rate/sample/sample.c
 @@ -842,8 +842,15 @@
                sn->num_rates = vap->iv_maxrateindex;
  
@@ -62,10 +56,8 @@ Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
                if (sn->rates[x].rix == 0xff) {
                        DPRINTF(sc, ATH_DEBUG_RATE, "%s: %s ignore bogus rix at %u\n",
                                dev_info, __func__, x);
-Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h        2008-03-07 02:30:53.284363550 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h     2008-03-07 02:32:12.600883541 +0100
+--- a/net80211/ieee80211_ioctl.h
++++ b/net80211/ieee80211_ioctl.h
 @@ -642,6 +642,7 @@
        IEEE80211_PARAM_BEACON_MISS_THRESH      = 73,   /* Beacon miss threshold (in beacons) */
        IEEE80211_PARAM_BEACON_MISS_THRESH_MS   = 74,   /* Beacon miss threshold (in ms) */
@@ -74,10 +66,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
  };
  
  #define       SIOCG80211STATS                 (SIOCDEVPRIVATE+2)
-Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h  2008-03-07 02:31:48.563513730 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_var.h       2008-03-07 02:32:12.604883771 +0100
+--- a/net80211/ieee80211_var.h
++++ b/net80211/ieee80211_var.h
 @@ -282,6 +282,7 @@
        struct ieee80211_app_ie app_ie[IEEE80211_APPIE_NUM_OF_FRAME]; /* app-specified IEs by frame type */
        u_int32_t app_filter;                           /* filters which management frames are forwarded to app */
@@ -86,10 +76,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
  };
  
  /* Debug functions need the defintion of struct ieee80211vap because iv_debug 
-Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c     2008-03-07 02:30:53.292364006 +0100
-+++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c  2008-03-07 02:32:12.604883771 +0100
+--- a/net80211/ieee80211_wireless.c
++++ b/net80211/ieee80211_wireless.c
 @@ -2845,6 +2845,12 @@
                else
                        vap->iv_maxrateindex = 0;