From owner-svn-src-all@FreeBSD.ORG Sun Mar 15 20:41:58 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2154212D; Sun, 15 Mar 2015 20:41:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 0D06418E; Sun, 15 Mar 2015 20:41:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2FKfvIX068634; Sun, 15 Mar 2015 20:41:57 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2FKfv6s068633; Sun, 15 Mar 2015 20:41:57 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201503152041.t2FKfv6s068633@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sun, 15 Mar 2015 20:41:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280073 - head/sys/dev/wpi 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.18-1 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: Sun, 15 Mar 2015 20:41:58 -0000 Author: adrian Date: Sun Mar 15 20:41:57 2015 New Revision: 280073 URL: https://svnweb.freebsd.org/changeset/base/280073 Log: Remove unnecessary locking. PR: kern/197143 Submitted by: Andriy Voskoboinyk Modified: head/sys/dev/wpi/if_wpi.c Modified: head/sys/dev/wpi/if_wpi.c ============================================================================== --- head/sys/dev/wpi/if_wpi.c Sun Mar 15 20:40:59 2015 (r280072) +++ head/sys/dev/wpi/if_wpi.c Sun Mar 15 20:41:57 2015 (r280073) @@ -3168,11 +3168,7 @@ wpi_updateedca(struct ieee80211com *ic) cmd.ac[aci].cwmin, cmd.ac[aci].cwmax, cmd.ac[aci].txoplimit); } - IEEE80211_UNLOCK(ic); - WPI_LOCK(sc); error = wpi_cmd(sc, WPI_CMD_EDCA_PARAMS, &cmd, sizeof cmd, 1); - WPI_UNLOCK(sc); - IEEE80211_LOCK(ic); DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__); @@ -4921,9 +4917,7 @@ wpi_scan_start(struct ieee80211com *ic) { struct wpi_softc *sc = ic->ic_ifp->if_softc; - WPI_LOCK(sc); wpi_set_led(sc, WPI_LED_LINK, 20, 2); - WPI_UNLOCK(sc); } /* @@ -4936,11 +4930,8 @@ wpi_scan_end(struct ieee80211com *ic) struct wpi_softc *sc = ifp->if_softc; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); - if (vap->iv_state == IEEE80211_S_RUN) { - WPI_LOCK(sc); + if (vap->iv_state == IEEE80211_S_RUN) wpi_set_led(sc, WPI_LED_LINK, 0, 1); - WPI_UNLOCK(sc); - } } /**