d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use if_maddr_rlock() in 802.11, use epoch(9) directly instead.

Browse Source
This commit is contained in:
Gleb Smirnoff 2019-10-10 23:55:33 +00:00
parent 45c1d51c39
commit 2b60ecf197
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/net80211/ieee80211_ioctl.c
View File

@ -3583,6 +3583,8 @@ ieee80211_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
IEEE80211_UNLOCK(ic);
/* Wait for parent ioctl handler if it was queued */
if (wait) {
struct epoch_tracker et;
ieee80211_waitfor_parent(ic);
/*
@ -3592,13 +3594,13 @@ ieee80211_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
* NB: device may be detached during initialization;
* use if_ioctl for existence check.
*/
if_addr_rlock(ifp);
NET_EPOCH_ENTER(et);
if (ifp->if_ioctl == ieee80211_ioctl &&
(ifp->if_flags & IFF_UP) == 0 &&
!IEEE80211_ADDR_EQ(vap->iv_myaddr, IF_LLADDR(ifp)))
IEEE80211_ADDR_COPY(vap->iv_myaddr,
IF_LLADDR(ifp));
if_addr_runlock(ifp);
NET_EPOCH_EXIT(et);
}
break;
case SIOCADDMULTI: