Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src-draft/trunk]: src/sys/dev/pci Use ieee80211_tx_complete() for error case...



details:   https://anonhg.NetBSD.org/src-all/rev/d4efbe3dc0f9
branches:  trunk
changeset: 987322:d4efbe3dc0f9
user:      Martin Husemann <martin%NetBSD.org@localhost>
date:      Sat Feb 13 18:51:00 2021 +0100

description:
Use ieee80211_tx_complete() for error cases too.

diffstat:

 sys/dev/pci/if_rtwn.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 8ac1ac90d963 -r d4efbe3dc0f9 sys/dev/pci/if_rtwn.c
--- a/sys/dev/pci/if_rtwn.c     Sat Feb 13 18:46:46 2021 +0100
+++ b/sys/dev/pci/if_rtwn.c     Sat Feb 13 18:51:00 2021 +0100
@@ -749,9 +749,8 @@
 
                if (tx_data->m != NULL) {
                        bus_dmamap_unload(sc->sc_dmat, tx_data->map);
-                       m_freem(tx_data->m);
+                       ieee80211_tx_complete(tx_data->ni, tx_data->m, 1);
                        tx_data->m = NULL;
-                       ieee80211_free_node(tx_data->ni);
                        tx_data->ni = NULL;
                }
        }
@@ -2130,9 +2129,9 @@
                        continue;
 
                bus_dmamap_unload(sc->sc_dmat, tx_data->map);
-               m_freem(tx_data->m);
+
+               ieee80211_tx_complete(tx_data->ni, tx_data->m, 0);
                tx_data->m = NULL;
-               ieee80211_free_node(tx_data->ni);
                tx_data->ni = NULL;
 
                sc->sc_tx_timer = 0;
@@ -2183,7 +2182,7 @@
                bpf_mtap(vap->iv_ifp, m, BPF_D_OUT);
 
                if (rtwn_raw_xmit(ni, m, NULL) != 0) {
-                       ieee80211_free_node(ni);
+                       ieee80211_tx_complete(ni, m, 1);
                        if (vap != NULL)
                                if_statinc(vap->iv_ifp, if_oerrors);
                        continue;



Home | Main Index | Thread Index | Old Index