Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/usb Opps....Remove irrelavent debug code and don't f...



details:   https://anonhg.NetBSD.org/src/rev/4306de8c34f0
branches:  trunk
changeset: 953272:4306de8c34f0
user:      nat <nat%NetBSD.org@localhost>
date:      Tue Mar 02 22:21:38 2021 +0000

description:
Opps....Remove irrelavent debug code and don't free_m before IFQ_DEQUEUE().

Identified and reported by Patrick Welche and remedy found by Martin Husemann.

diffstat:

 sys/dev/usb/if_urtwn.c |  9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diffs (37 lines):

diff -r b0d263b6987a -r 4306de8c34f0 sys/dev/usb/if_urtwn.c
--- a/sys/dev/usb/if_urtwn.c    Tue Mar 02 18:10:31 2021 +0000
+++ b/sys/dev/usb/if_urtwn.c    Tue Mar 02 22:21:38 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_urtwn.c,v 1.95 2021/02/26 01:38:44 nat Exp $        */
+/*     $NetBSD: if_urtwn.c,v 1.96 2021/03/02 22:21:38 nat Exp $        */
 /*     $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $       */
 
 /*-
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.95 2021/02/26 01:38:44 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.96 2021/03/02 22:21:38 nat Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1470,10 +1470,6 @@
            sc->pa_setting, sc->board_type, sc->regulatory, 0);
 
        IEEE80211_ADDR_COPY(ic->ic_myaddr, rom->macaddr);
-#if 0
-       uint8_t new_myaddr[6] = {0x90,0x0a,0x1a,0xe7,0x1e,0xf0}; //Camera
-       IEEE80211_ADDR_COPY(ic->ic_myaddr, new_myaddr);
-#endif
 
        sc->sc_rf_write = urtwn_r92c_rf_write;
        sc->sc_power_on = urtwn_r92c_power_on;
@@ -2913,7 +2909,6 @@
                data = urtwn_get_tx_data(sc, sc->ac2idx[qid]);
 
                if (data == NULL) {
-                       m_freem(m);
                        ifp->if_flags |= IFF_OACTIVE;
                        DPRINTFN(DBG_TX, "empty tx_free_list", 0, 0, 0, 0);
                        return;



Home | Main Index | Thread Index | Old Index