madwifi: preserve WPA IEs received in probe responses and prefer them over beacon...

[openwrt.git] / package / madwifi / patches / 340-maxrate.patch

diff --git a/package/madwifi/patches/340-maxrate.patch b/package/madwifi/patches/340-maxrate.patch
index 1d9f4c6..ecefd82 100644 (file)
--- a/package/madwifi/patches/340-maxrate.patch
+++ b/package/madwifi/patches/340-maxrate.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3314/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath/if_ath.c
-+++ madwifi-trunk-r3314/ath/if_ath.c
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
 @@ -1307,6 +1307,7 @@
        vap->iv_key_set = ath_key_set;
        vap->iv_key_update_begin = ath_key_update_begin;
@@ -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
-+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
+--- a/ath_rate/minstrel/minstrel.c
++++ b/ath_rate/minstrel/minstrel.c
 @@ -622,8 +622,12 @@
                        return;
                }
@@ -28,10 +24,8 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
                for (x = 0; x < ni->ni_rates.rs_nrates; x++) {
                        sn->rs_rateattempts     [x] = 0;
                        sn->rs_thisprob         [x] = 0;
-Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c
-+++ madwifi-trunk-r3314/ath_rate/sample/sample.c
+--- a/ath_rate/sample/sample.c
++++ b/ath_rate/sample/sample.c
 @@ -835,7 +835,12 @@
        }
        sn->static_rate_ndx = -1;
@@ -46,10 +40,8 @@ Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
        for (x = 0; x < ni->ni_rates.rs_nrates; x++) {
                sn->rates[x].rate = ni->ni_rates.rs_rates[x] & IEEE80211_RATE_VAL;
                sn->rates[x].rix = sc->sc_rixmap[sn->rates[x].rate];
-Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
-===================================================================
---- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h
-+++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
+--- a/net80211/ieee80211_ioctl.h
++++ b/net80211/ieee80211_ioctl.h
 @@ -641,6 +641,7 @@
                                                           FCC requires 30m, so that is the default. */
        IEEE80211_PARAM_BEACON_MISS_THRESH      = 73,   /* Beacon miss threshold (in beacons) */
@@ -58,10 +50,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
-+++ madwifi-trunk-r3314/net80211/ieee80211_var.h
+--- a/net80211/ieee80211_var.h
++++ b/net80211/ieee80211_var.h
 @@ -281,6 +281,7 @@
        struct ieee80211_spy iv_spy;                    /* IWSPY support */
        struct ieee80211_app_ie app_ie[IEEE80211_APPIE_NUM_OF_FRAME]; /* app-specified IEs by frame type */
@@ -70,10 +60,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
-+++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c
+--- a/net80211/ieee80211_wireless.c
++++ b/net80211/ieee80211_wireless.c
 @@ -2839,6 +2839,12 @@
                else
                        ic->ic_flags_ext &= ~IEEE80211_FEXT_MARKDFS;