Ticket #228: setmode-delay-with-timeout2.diff

net80211/ieee80211_wireless.c

@@ -48 +48 @@
-#include <linux/utsname.h>
-#include <linux/if_arp.h>               /* XXX for ARPHRD_ETHER */
-#include <net/iw_handler.h>
+#include <linux/delay.h>
-
-#if WIRELESS_EXT < 14
-#error "Wireless extensions v14 or better is needed."
@@ -1537 +1538 @@
-        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;
@@ -1573 +1574 @@
-                vap->iv_des_mode = mode;
-                if (IS_UP_AUTO(vap)) {
-                        ieee80211_cancel_scan(vap);
+                        itr_count = 0;
+                        while((ic->ic_flags & IEEE80211_F_SCAN) != 0) {
+                                mdelay(1);
+                                if (itr_count < 100) {
+                                        itr_count++;
+                                        continue;
+                                }
+                                IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
+                                  "%s: Timeout cancelling current scan.\n",
+                                  __func__);
+                                return -ETIMEDOUT;
+                        }
-                        ieee80211_new_state(vap, IEEE80211_S_SCAN, 0);
-                }
-                retv = 0;