Ticket #275: backout-preempt-scan.diff

net80211/ieee80211_wireless.c

@@ -48 +48 @@
-#include <linux/netdevice.h>
-#include <linux/utsname.h>
-#include <linux/if_arp.h>               /* for ARPHRD_ETHER */
-#include <linux/delay.h>
-
-#include <linux/wireless.h>
-#include <net/iw_handler.h>
@@ -75 +74 @@
-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)
-{
-        struct ieee80211vap *vap = dev->priv;
-        struct ieee80211com *ic = vap->iv_ic;
-        int total_delay = 0;
-        int canceled = 0, ready = 0;
-
-        while (!ready && total_delay < max_grace + max_wait) {
-                if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) {
-                        ready = 1;
-                } else {
-                        if (!canceled && (total_delay > max_grace)) {
-                                /* Cancel any existing active scan, so that any new parameters
-                                 * in this scan ioctl (or the defaults) can be honored, then
-                                 * wait around a while to see if the scan cancels properly. */
-                                IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
-                                                "%s: cancel pending scan request\n", __func__);
-                                (void) ieee80211_cancel_scan(vap);
-                                canceled = 1;
-                        }
-                        mdelay (1);
-                        total_delay += 1;
-                }
-        }
-
-        if (!ready) {
-                IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
-                                "%s: Timeout canceling current scan.\n",
-                                __func__);
-        }
-
-        return ready;
-}
-
-static struct iw_statistics *
-ieee80211_iw_getstats(struct net_device *dev)
-{
@@ -1536 +1500 @@
-        /* XXX always manual... */
-        IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
-                "%s: active scan request\n", __func__);
-        preempt_scan(dev, 100, 100);
-#if WIRELESS_EXT > 17
+        /* XXX do we need to remove this code after backing
+         * out preempt_scan?
+         * => ticket 275 */
-        if (data && (data->flags & IW_SCAN_THIS_ESSID)) {
-                struct iw_scan_req req;
-                struct ieee80211_scan_ssid ssid;
@@ -1957 +1923 @@
-        struct ieee80211com *ic = vap->iv_ic;
-        struct ifreq ifr;
-        char s[6];              /* big enough for ``11adt'' */
-
+, itr_count
-
-        if (ic->ic_media.ifm_cur == NULL)
-                return -EINVAL;                 /* XXX: Wrong error */
@@ -1990 +1956 @@
-
-        retv = ifmedia_ioctl(ic->ic_dev, &ifr, &ic->ic_media, SIOCSIFMEDIA);
-        if ((!retv || retv == -ENETRESET) && (mode != vap->iv_des_mode)) {
-
-
-
-
-
+
-                vap->iv_des_mode = mode;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        ieee80211_new_state(vap, IEEE80211_S_SCAN, 0);
+                }
-
-                retv = 0;
-        }