From owner-svn-src-stable@freebsd.org  Sat Oct  8 16:39:23 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D5F9C06977;
 Sat,  8 Oct 2016 16:39:23 +0000 (UTC)
 (envelope-from avos@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 0C76ECF5;
 Sat,  8 Oct 2016 16:39:22 +0000 (UTC)
 (envelope-from avos@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98GdMlP057836;
 Sat, 8 Oct 2016 16:39:22 GMT (envelope-from avos@FreeBSD.org)
Received: (from avos@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98GdM6h057835;
 Sat, 8 Oct 2016 16:39:22 GMT (envelope-from avos@FreeBSD.org)
Message-Id: <201610081639.u98GdM6h057835@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avos set sender to
 avos@FreeBSD.org using -f
From: Andriy Voskoboinyk <avos@FreeBSD.org>
Date: Sat, 8 Oct 2016 16:39:22 +0000 (UTC)
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
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Oct 2016 16:39:23 -0000

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;