Ticket #1388: madwifi-0.9.3-chanswitch.diff

net80211/ieee80211_wireless.c

@@ -72 +72 @@
-         (_vap)->iv_ic->ic_roaming == IEEE80211_ROAMING_AUTO)
-#define RESCAN  1
-
+static void
+pre_announced_chanswitch(struct net_device *dev, u_int32_t channel, u_int32_t tbtt);
+
-static int
-preempt_scan(struct net_device *dev, int max_grace, int max_wait)
-{
@@ -754 +757 @@
-                if (vap->iv_state == IEEE80211_S_RUN) {
-                        ic->ic_set_channel(ic);
-                }
+        } else if(vap->iv_opmode == IEEE80211_M_HOSTAP) {
+                /* 
+                Need to use channel switch announcement on beacon if we are up and running.  
+                We use ic_set_channel directly if we are "running" but not "up".
+                Otherwise iv_des_chan will take effect when we are transitioned.
+                */
+                if(IS_UP(vap->iv_dev)) {
+                        pre_announced_chanswitch(dev, ieee80211_chan2ieee(ic, vap->iv_des_chan), IEEE80211_DEFAULT_CHANCHANGE_TBTT_COUNT);
+                }
+                else if (vap->iv_state == IEEE80211_S_RUN) {
+                        ic->ic_curchan = vap->iv_des_chan;
+                        ic->ic_set_channel(ic);
+                }
-        } else {
-                /*
-                 * Need to go through the state machine in case we need
@@ -4132 +4148 @@
-        return (error ? -EFAULT : 0);
-}
-
+static void
+pre_announced_chanswitch(struct net_device *dev, u_int32_t channel, u_int32_t tbtt) {
+        struct ieee80211vap *vap = dev->priv;
+        struct ieee80211com *ic = vap->iv_ic;
+        /* now flag the beacon update to include the channel switch IE */
+        ic->ic_flags |= IEEE80211_F_CHANSWITCH;
+        ic->ic_chanchange_chan = channel;
+        ic->ic_chanchange_tbtt = tbtt;
+}
+
-static int
-ieee80211_ioctl_chanswitch(struct net_device *dev, struct iw_request_info *info,
-        void *w, char *extra)
@@ -4143 +4167 @@
-        if (!(ic->ic_flags & IEEE80211_F_DOTH))
-                return 0;
-
-
-
-
-
+
-
-        return 0;
-}