Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Oct 2015 17:35:03 +0000 (UTC)
From:      Andriy Voskoboinyk <avos@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r289841 - head/sys/dev/usb/wlan
Message-ID:  <201510231735.t9NHZ3Gh054063@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avos
Date: Fri Oct 23 17:35:03 2015
New Revision: 289841
URL: https://svnweb.freebsd.org/changeset/base/289841

Log:
  run(4): convert to ieee80211_tx_complete()
  
  Approved by:	adrian (mentor)
  Differential Revision:	https://reviews.freebsd.org/D3992

Modified:
  head/sys/dev/usb/wlan/if_run.c

Modified: head/sys/dev/usb/wlan/if_run.c
==============================================================================
--- head/sys/dev/usb/wlan/if_run.c	Fri Oct 23 17:30:41 2015	(r289840)
+++ head/sys/dev/usb/wlan/if_run.c	Fri Oct 23 17:35:03 2015	(r289841)
@@ -3030,20 +3030,11 @@ static void
 run_tx_free(struct run_endpoint_queue *pq,
     struct run_tx_data *data, int txerr)
 {
-	if (data->m != NULL) {
-		if (data->m->m_flags & M_TXCB)
-			ieee80211_process_callback(data->ni, data->m,
-			    txerr ? ETIMEDOUT : 0);
-		m_freem(data->m);
-		data->m = NULL;
 
-		if (data->ni == NULL) {
-			DPRINTF("no node\n");
-		} else {
-			ieee80211_free_node(data->ni);
-			data->ni = NULL;
-		}
-	}
+	ieee80211_tx_complete(data->ni, data->m, txerr);
+
+	data->m = NULL;
+	data->ni = NULL;
 
 	STAILQ_INSERT_TAIL(&pq->tx_fh, data, next);
 	pq->tx_nfree++;



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