diff options
| author | rpaulo <rpaulo@FreeBSD.org> | 2013-06-29 06:36:42 +0000 |
|---|---|---|
| committer | rpaulo <rpaulo@FreeBSD.org> | 2013-06-29 06:36:42 +0000 |
| commit | 19c9c3ef1816ae07c3ebe3b20b1b0adc88677d2b (patch) | |
| tree | aa4b8d5df0088277f7f93a128be62d0ccffa666c /sys/net80211 | |
| parent | 51861f0c71f2b3945937dbef2e27efaf6e19fe92 (diff) | |
| download | FreeBSD-src-19c9c3ef1816ae07c3ebe3b20b1b0adc88677d2b.zip FreeBSD-src-19c9c3ef1816ae07c3ebe3b20b1b0adc88677d2b.tar.gz | |
Don't panic the kernel if we run wpa_supplicant on a hostap VAP.
Reviewed by: adrian
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_ioctl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 9f58754..6b668cb 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -1589,7 +1589,9 @@ ieee80211_ioctl_setmlme(struct ieee80211vap *vap, struct ieee80211req *ireq) 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 |
