fix nonhotpluggable networks not being brought up. Closes #2781

[openwrt.git] / package / madwifi / patches / 411-autochannel_multi.patch

diff --git a/package/madwifi/patches/411-autochannel_multi.patch b/package/madwifi/patches/411-autochannel_multi.patch
index 827ab58..94ffd9f 100644 (file)
--- a/package/madwifi/patches/411-autochannel_multi.patch
+++ b/package/madwifi/patches/411-autochannel_multi.patch
@@ -87,7 +87,7 @@
 +              else
 +                      bias += get_overlap(ch->freq, c->ic_freq, ch->bw, bw);
 +      }
 +              else
 +                      bias += get_overlap(ch->freq, c->ic_freq, ch->bw, bw);
 +      }

-+      return min(bias, (u32) 100);
++      return bias;

 +}
 +EXPORT_SYMBOL(ieee80211_scan_get_bias);
 +
 +}
 +EXPORT_SYMBOL(ieee80211_scan_get_bias);
 +


@@ -124,7 +124,7 @@
  void
  ieee80211_scan_attach(struct ieee80211com *ic)
  {
  void
  ieee80211_scan_attach(struct ieee80211com *ic)
  {

-@@ -1168,7 +1285,7 @@ ieee80211_scan_dfs_action(struct ieee802
+@@ -1169,7 +1286,7 @@ ieee80211_scan_dfs_action(struct ieee802

                                IEEE80211_RADAR_CHANCHANGE_TBTT_COUNT;
                        ic->ic_flags |= IEEE80211_F_CHANSWITCH;
                } else {
                                IEEE80211_RADAR_CHANCHANGE_TBTT_COUNT;
                        ic->ic_flags |= IEEE80211_F_CHANSWITCH;
                } else {


@@ -133,7 +133,7 @@
                        IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH,
                                        "%s: directly switching to channel "
                                        "%3d (%4d MHz)\n", __func__,
                        IEEE80211_DPRINTF(vap, IEEE80211_MSG_DOTH,
                                        "%s: directly switching to channel "
                                        "%3d (%4d MHz)\n", __func__,

-@@ -1179,6 +1296,9 @@ ieee80211_scan_dfs_action(struct ieee802
+@@ -1180,6 +1297,9 @@ ieee80211_scan_dfs_action(struct ieee802

                         * change the channel here. */
                        change_channel(ic, new_channel);
                        ic->ic_bsschan = new_channel;
                         * change the channel here. */
                        change_channel(ic, new_channel);
                        ic->ic_bsschan = new_channel;


@@ -241,7 +241,7 @@
         * the auto-select case; this should be redundant if the
 --- a/net80211/ieee80211_proto.c
 +++ b/net80211/ieee80211_proto.c
         * the auto-select case; this should be redundant if the
 --- a/net80211/ieee80211_proto.c
 +++ b/net80211/ieee80211_proto.c

-@@ -1225,6 +1225,7 @@ ieee80211_dturbo_switch(struct ieee80211
+@@ -1231,6 +1231,7 @@ ieee80211_dturbo_switch(struct ieee80211

        struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
  #endif
        struct ieee80211_channel *chan;
        struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
  #endif
        struct ieee80211_channel *chan;


@@ -249,7 +249,7 @@
  
        chan = ieee80211_find_channel(ic, ic->ic_bsschan->ic_freq, newflags);
        if (chan == NULL) {             /* XXX should not happen */
  
        chan = ieee80211_find_channel(ic, ic->ic_bsschan->ic_freq, newflags);
        if (chan == NULL) {             /* XXX should not happen */

-@@ -1243,6 +1244,9 @@ ieee80211_dturbo_switch(struct ieee80211
+@@ -1249,6 +1250,9 @@ ieee80211_dturbo_switch(struct ieee80211

        ic->ic_bsschan = chan;
        ic->ic_curchan = chan;
        ic->ic_set_channel(ic);
        ic->ic_bsschan = chan;
        ic->ic_curchan = chan;
        ic->ic_set_channel(ic);