Date: Sat, 8 Oct 2016 16:39:22 +0000 (UTC) From: Andriy Voskoboinyk <avos@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r306851 - stable/11/sys/dev/ral Message-ID: <201610081639.u98GdM6h057835@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avos Date: Sat Oct 8 16:39:21 2016 New Revision: 306851 URL: https://svnweb.freebsd.org/changeset/base/306851 Log: MFC r306498: ral (rt2860): eliminate duplicate ieee80211_process_callback() call (left after r287197) While here, add missing mergeinfo for r306320 (committed in r306549) Modified: stable/11/sys/dev/ral/rt2860.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/ral/rt2860.c ============================================================================== --- stable/11/sys/dev/ral/rt2860.c Sat Oct 8 14:58:26 2016 (r306850) +++ stable/11/sys/dev/ral/rt2860.c Sat Oct 8 16:39:21 2016 (r306851) @@ -1140,10 +1140,6 @@ rt2860_tx_intr(struct rt2860_softc *sc, bus_dmamap_sync(sc->txwi_dmat, data->map, BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(sc->txwi_dmat, data->map); - if (data->m->m_flags & M_TXCB) { - ieee80211_process_callback(data->ni, data->m, - 0); - } ieee80211_tx_complete(data->ni, data->m, 0); data->ni = NULL; data->m = NULL;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610081639.u98GdM6h057835>