madwifi: fix uninitialized variable

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

diff --git a/package/madwifi/patches/389-autochannel.patch b/package/madwifi/patches/389-autochannel.patch
index 8f7437a..c818b89 100644 (file)
--- a/package/madwifi/patches/389-autochannel.patch
+++ b/package/madwifi/patches/389-autochannel.patch
@@ -208,7 +208,7 @@
                if (ss->ss_last > 0) {
 --- a/net80211/ieee80211_scan.c
 +++ b/net80211/ieee80211_scan.c
-@@ -1002,20 +1002,33 @@ ieee80211_scan_add_channels(struct ieee8
+@@ -1002,20 +1002,34 @@ ieee80211_scan_add_channels(struct ieee8
  {
        struct ieee80211_channel *c, *cg;
        u_int modeflags;
@@ -218,6 +218,7 @@
        KASSERT(mode < ARRAY_SIZE(chanflags), ("Unexpected mode %u", mode));
        modeflags = chanflags[mode];
        for (i = 0; i < ic->ic_nchans; i++) {
+               c = &ic->ic_channels[i];
 +              if (c->ic_flags & (IEEE80211_CHAN_TURBO | IEEE80211_CHAN_STURBO))
 +                      continue;
 +
@@ -225,7 +226,7 @@
 +              break;
 +      }
 +      for (i = 0; i < ic->ic_nchans; i++) {
-               c = &ic->ic_channels[i];
++              c = &ic->ic_channels[i];
                if (c == NULL || isclr(ic->ic_chan_active, c->ic_ieee))
                        continue;
                if (c->ic_scanflags & IEEE80211_NOSCAN_SET)

diff --git a/package/madwifi/patches/411-autochannel_multi.patch b/package/madwifi/patches/411-autochannel_multi.patch
index 6b970ca..1140a1e 100644 (file)
--- a/package/madwifi/patches/411-autochannel_multi.patch
+++ b/package/madwifi/patches/411-autochannel_multi.patch
@@ -124,7 +124,7 @@
  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 {
@@ -133,7 +133,7 @@
                        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;