Date: Sat, 29 Jun 2013 06:36:42 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r252369 - head/sys/net80211 Message-ID: <201306290636.r5T6agwI064888@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306290636.r5T6agwI064888>