madwifi: move autochannel idletime decision after radar and phy mode checking

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13564 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/madwifi/patches/389-autochannel.patch b/package/madwifi/patches/389-autochannel.patch
index 7926d2e..0e4cad8 100644 (file)
--- a/package/madwifi/patches/389-autochannel.patch
+++ b/package/madwifi/patches/389-autochannel.patch
@@ -115,11 +115,11 @@
  pc_cmp_samechan(struct ieee80211com *ic, struct ieee80211_channel *a,
                struct ieee80211_channel *b)
  {
  pc_cmp_samechan(struct ieee80211com *ic, struct ieee80211_channel *a,
                struct ieee80211_channel *b)
  {

-@@ -455,6 +468,7 @@ pc_cmp(const void *_a, const void *_b)
-               return res;                                     \
- } while (0)
+@@ -457,6 +470,7 @@ pc_cmp(const void *_a, const void *_b)

  
  

-+      EVALUATE_CRITERION(idletime, a, b);

        EVALUATE_CRITERION(radar, a, b);
        EVALUATE_CRITERION(keepmode, params, a, b);
        EVALUATE_CRITERION(radar, a, b);
        EVALUATE_CRITERION(keepmode, params, a, b);

++      EVALUATE_CRITERION(idletime, a, b);

        EVALUATE_CRITERION(sc, ic, a, b);
        EVALUATE_CRITERION(sc, ic, a, b);

+       /* XXX: rssi useless? pick_channel evaluates it anyway */
+       EVALUATE_CRITERION(rssi, params->ss->ss_priv, a, b);