Date: Tue, 18 Oct 2011 12:13:21 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r226508 - user/adrian/if_ath_tx/sys/dev/ath Message-ID: <201110181213.p9ICDLH5073237@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Tue Oct 18 12:13:20 2011 New Revision: 226508 URL: http://svn.freebsd.org/changeset/base/226508 Log: Lock ath_raw_xmit() for now, matching how ath_start() is currently locked. Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c Tue Oct 18 11:29:10 2011 (r226507) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c Tue Oct 18 12:13:20 2011 (r226508) @@ -1663,6 +1663,8 @@ ath_raw_xmit(struct ieee80211_node *ni, struct ath_buf *bf; int error; + ATH_LOCK(sc); + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 || sc->sc_invalid) { DPRINTF(sc, ATH_DEBUG_XMIT, "%s: discard frame, %s", __func__, (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 ? @@ -1705,6 +1707,8 @@ ath_raw_xmit(struct ieee80211_node *ni, ifp->if_opackets++; sc->sc_stats.ast_tx_raw++; + ATH_UNLOCK(sc); + return 0; bad2: ATH_TXBUF_LOCK(sc); @@ -1713,6 +1717,7 @@ bad2: bad: ifp->if_oerrors++; sc->sc_stats.ast_tx_raw_fail++; + ATH_UNLOCK(sc); ieee80211_free_node(ni); return error; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110181213.p9ICDLH5073237>