Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Feb 2019 14:27:26 +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-12@freebsd.org
Subject:   svn commit: r343908 - in stable: 11/sys/dev/bwn 12/sys/dev/bwn
Message-ID:  <201902081427.x18ERQid020832@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avos
Date: Fri Feb  8 14:27:25 2019
New Revision: 343908
URL: https://svnweb.freebsd.org/changeset/base/343908

Log:
  MFC r343604:
  bwn(4): reuse ieee80211_tx_complete function

Modified:
  stable/12/sys/dev/bwn/if_bwn.c
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/dev/bwn/if_bwn.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/sys/dev/bwn/if_bwn.c
==============================================================================
--- stable/12/sys/dev/bwn/if_bwn.c	Fri Feb  8 13:57:28 2019	(r343907)
+++ stable/12/sys/dev/bwn/if_bwn.c	Fri Feb  8 14:27:25 2019	(r343908)
@@ -6211,20 +6211,15 @@ bwn_pio_handle_txeof(struct bwn_mac *mac,
 	tq->tq_used -= roundup(tp->tp_m->m_pkthdr.len + BWN_HDRSIZE(mac), 4);
 	tq->tq_free++;
 
-	/* XXX ieee80211_tx_complete()? */
 	if (tp->tp_ni != NULL) {
 		/*
 		 * Do any tx complete callback.  Note this must
 		 * be done before releasing the node reference.
 		 */
-
 		bwn_ratectl_tx_complete(tp->tp_ni, status);
-		if (tp->tp_m->m_flags & M_TXCB)
-			ieee80211_process_callback(tp->tp_ni, tp->tp_m, 0);
-		ieee80211_free_node(tp->tp_ni);
-		tp->tp_ni = NULL;
 	}
-	m_freem(tp->tp_m);
+	ieee80211_tx_complete(tp->tp_ni, tp->tp_m, 0);
+	tp->tp_ni = NULL;
 	tp->tp_m = NULL;
 	TAILQ_INSERT_TAIL(&tq->tq_pktlist, tp, tp_list);
 



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