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

net80211: remove redundant locking.

Browse Source 
All callers of ieee80211_promisc()/ieee80211_allmulti()
(ieee80211_vap_detach(), ieee80211_ioctl(), ap_start() and ap_end())
already hold the com_lock while calling them.

Tested with RTL8188EU, STA mode.

Approved by:	adrian (mentor)
Differential Revision:	https://reviews.freebsd.org/D5475
This commit is contained in:
avos 2016-02-28 23:48:34 +00:00
parent e4f93d9c2b
commit 8c268c22c4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/net80211/ieee80211.c
View File

@ -714,7 +714,8 @@ ieee80211_promisc(struct ieee80211vap *vap, bool on)
(vap->iv_caps & IEEE80211_C_TDMA) == 0)))
return;
IEEE80211_LOCK(ic);
IEEE80211_LOCK_ASSERT(ic);
if (on) {
if (++ic->ic_promisc == 1)
ieee80211_runtask(ic, &ic->ic_promisc_task);
@ -724,7 +725,6 @@ ieee80211_promisc(struct ieee80211vap *vap, bool on)
if (--ic->ic_promisc == 0)
ieee80211_runtask(ic, &ic->ic_promisc_task);
}
IEEE80211_UNLOCK(ic);
}
/*
@ -736,7 +736,8 @@ ieee80211_allmulti(struct ieee80211vap *vap, bool on)
{
struct ieee80211com *ic = vap->iv_ic;
IEEE80211_LOCK(ic);
IEEE80211_LOCK_ASSERT(ic);
if (on) {
if (++ic->ic_allmulti == 1)
ieee80211_runtask(ic, &ic->ic_mcast_task);
@ -746,7 +747,6 @@ ieee80211_allmulti(struct ieee80211vap *vap, bool on)
if (--ic->ic_allmulti == 0)
ieee80211_runtask(ic, &ic->ic_mcast_task);
}
IEEE80211_UNLOCK(ic);
}
/*