Date: Fri, 8 Feb 2019 14:27:25 +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: r343908 - in stable: 11/sys/dev/bwn 12/sys/dev/bwn Message-ID: <201902081427.x18ERPWR020826@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/11/sys/dev/bwn/if_bwn.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/12/sys/dev/bwn/if_bwn.c Directory Properties: stable/12/ (props changed) Modified: stable/11/sys/dev/bwn/if_bwn.c ============================================================================== --- stable/11/sys/dev/bwn/if_bwn.c Fri Feb 8 13:57:28 2019 (r343907) +++ stable/11/sys/dev/bwn/if_bwn.c Fri Feb 8 14:27:25 2019 (r343908) @@ -5992,7 +5992,6 @@ bwn_pio_handle_txeof(struct bwn_mac *mac, * Do any tx complete callback. Note this must * be done before releasing the node reference. */ - /* * If we don't get an ACK, then we should log the * full framecnt. That may be 0 if it's a PHY @@ -6012,12 +6011,9 @@ bwn_pio_handle_txeof(struct bwn_mac *mac, IEEE80211_RATECTL_TX_FAILURE, &retrycnt, 0); - 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.x18ERPWR020826>