Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 28 Feb 2016 23:48:34 +0000 (UTC)
From:      Andriy Voskoboinyk <avos@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r296170 - head/sys/net80211
Message-ID:  <201602282348.u1SNmYAS016133@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: avos
Date: Sun Feb 28 23:48:34 2016
New Revision: 296170
URL: https://svnweb.freebsd.org/changeset/base/296170

Log:
  net80211: remove redundant locking.
  
  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

Modified:
  head/sys/net80211/ieee80211.c

Modified: head/sys/net80211/ieee80211.c
==============================================================================
--- head/sys/net80211/ieee80211.c	Sun Feb 28 23:35:03 2016	(r296169)
+++ head/sys/net80211/ieee80211.c	Sun Feb 28 23:48:34 2016	(r296170)
@@ -714,7 +714,8 @@ ieee80211_promisc(struct ieee80211vap *v
 	       (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 *v
 		if (--ic->ic_promisc == 0)
 			ieee80211_runtask(ic, &ic->ic_promisc_task);
 	}
-	IEEE80211_UNLOCK(ic);
 }
 
 /*
@@ -736,7 +736,8 @@ ieee80211_allmulti(struct ieee80211vap *
 {
 	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 *
 		if (--ic->ic_allmulti == 0)
 			ieee80211_runtask(ic, &ic->ic_mcast_task);
 	}
-	IEEE80211_UNLOCK(ic);
 }
 
 /*

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602282348.u1SNmYAS016133>