From owner-svn-src-all@freebsd.org Mon May 2 20:46:06 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8EED3B2ACE4; Mon, 2 May 2016 20:46:06 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6041117F2; Mon, 2 May 2016 20:46:06 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u42Kk5ev035969; Mon, 2 May 2016 20:46:05 GMT (envelope-from avos@FreeBSD.org) Received: (from avos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u42Kk5nd035968; Mon, 2 May 2016 20:46:05 GMT (envelope-from avos@FreeBSD.org) Message-Id: <201605022046.u42Kk5nd035968@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avos set sender to avos@FreeBSD.org using -f From: Andriy Voskoboinyk Date: Mon, 2 May 2016 20:46:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298941 - head/sys/net80211 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 May 2016 20:46:06 -0000 Author: avos Date: Mon May 2 20:46:05 2016 New Revision: 298941 URL: https://svnweb.freebsd.org/changeset/base/298941 Log: net80211: fix MAC address change via SIOCSIFLLADDR ioctl. Recheck MAC address on SIOCSIFFLAGS; as a result, 'ifconfig wlan0 ether ' can be used after interface startup. PR: 208933 Modified: head/sys/net80211/ieee80211_ioctl.c Modified: head/sys/net80211/ieee80211_ioctl.c ============================================================================== --- head/sys/net80211/ieee80211_ioctl.c Mon May 2 20:16:29 2016 (r298940) +++ head/sys/net80211/ieee80211_ioctl.c Mon May 2 20:46:05 2016 (r298941) @@ -3382,8 +3382,18 @@ ieee80211_ioctl(struct ifnet *ifp, u_lon } IEEE80211_UNLOCK(ic); /* Wait for parent ioctl handler if it was queued */ - if (wait) + if (wait) { ieee80211_waitfor_parent(ic); + + /* + * Check if the MAC address was changed + * via SIOCSIFLLADDR ioctl. + */ + if ((ifp->if_flags & IFF_UP) == 0 && + !IEEE80211_ADDR_EQ(vap->iv_myaddr, IF_LLADDR(ifp))) + IEEE80211_ADDR_COPY(vap->iv_myaddr, + IF_LLADDR(ifp)); + } break; case SIOCADDMULTI: case SIOCDELMULTI: