summaryrefslogtreecommitdiffstats
path: root/sys/net80211/ieee80211_ioctl.c
diff options
context:
space:
mode:
authorsam <sam@FreeBSD.org>2003-07-20 21:36:08 +0000
committersam <sam@FreeBSD.org>2003-07-20 21:36:08 +0000
commit51c8bf1aebf18e644d2c3354aa5e0e5048baab1e (patch)
tree6b4b08b659abfee0261b08146037555ec5351239 /sys/net80211/ieee80211_ioctl.c
parent6d201c6f71fac3e288a6c52e28186f84237bdb36 (diff)
downloadFreeBSD-src-51c8bf1aebf18e644d2c3354aa5e0e5048baab1e.zip
FreeBSD-src-51c8bf1aebf18e644d2c3354aa5e0e5048baab1e.tar.gz
o change ieee80211_new_state handling to use a proper method that drivers
override in their sub-class; this eliminates the hack of interpreting the EINPROGRESS return value to mean "don't do any of the normal work" o correct active scanning so the first channel is only scanned once and so per-channel passive mode is properly honored o expose 802.11 FSM state names so every driver doesn't keep a private copy o eliminate node parameter to ieee80211_begin_scan; it was not being used
Diffstat (limited to 'sys/net80211/ieee80211_ioctl.c')
-rw-r--r--sys/net80211/ieee80211_ioctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c
index 46c015c..4ae0401 100644
--- a/sys/net80211/ieee80211_ioctl.c
+++ b/sys/net80211/ieee80211_ioctl.c
@@ -659,7 +659,7 @@ ieee80211_cfgset(struct ifnet *ifp, u_long cmd, caddr_t data)
if (ic->ic_opmode == IEEE80211_M_HOSTAP)
break;
/* NB: ignore channel list and tx rate parameters */
- error = ieee80211_new_state(ifp, IEEE80211_S_SCAN, -1);
+ error = ieee80211_new_state(ic, IEEE80211_S_SCAN, -1);
break;
case WI_RID_SCAN_APS:
if (ic->ic_opmode == IEEE80211_M_HOSTAP)
@@ -703,7 +703,7 @@ ieee80211_cfgset(struct ifnet *ifp, u_long cmd, caddr_t data)
if (wreq.wi_type == WI_RID_CHANNEL_LIST)
error = ENETRESET;
else
- error = ieee80211_new_state(ifp, IEEE80211_S_SCAN, -1);
+ error = ieee80211_new_state(ic, IEEE80211_S_SCAN, -1);
break;
default:
error = EINVAL;
OpenPOWER on IntegriCloud