Author: rpaulo
Date: Sat Jun 29 06:36:42 2013
New Revision: 252369
URL: http://svnweb.freebsd.org/changeset/base/252369
Log:
Don't panic the kernel if we run wpa_supplicant on a hostap VAP.
Reviewed by: adrian
Modified:
head/sys/net80211/ieee80211_ioctl.c
Modified: head/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- head/sys/net80211/ieee80211_ioctl.c Sat Jun 29 05:05:57 2013
(r252368)
+++ head/sys/net80211/ieee80211_ioctl.c Sat Jun 29 06:36:42 2013
(r252369)
@@ -1589,7 +1589,9 @@ ieee80211_ioctl_setmlme(struct ieee80211
mlme.im_op == IEEE80211_MLME_ASSOC)
return setmlme_assoc_sta(vap, mlme.im_macaddr,
vap->iv_des_ssid[0].len, vap->iv_des_ssid[0].ssid);
- else if (mlme.im_op == IEEE80211_MLME_ASSOC)
+ else if ((vap->iv_opmode == IEEE80211_M_IBSS ||
+ vap->iv_opmode == IEEE80211_M_AHDEMO) &&
+ mlme.im_op == IEEE80211_MLME_ASSOC)
return setmlme_assoc_adhoc(vap, mlme.im_macaddr,
mlme.im_ssid_len, mlme.im_ssid);
else
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
