[src/netbsd-8]: src/sys/dev Pull up following revision(s) (requested by msait...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0075e35a502f
branches:  netbsd-8
changeset: 460858:0075e35a502f
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Nov 06 10:25:26 2019 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1429):

        sys/dev/usb/ubt.c: revision 1.61
        sys/dev/sdmmc/sbt.c: revision 1.6

m_free -> m_freem, m_copyback could have added mbufs in the chain

diffstat:

 sys/dev/sdmmc/sbt.c |  8 ++++----
 sys/dev/usb/ubt.c   |  6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 86fbe4ab3035 -r 0075e35a502f sys/dev/sdmmc/sbt.c
--- a/sys/dev/sdmmc/sbt.c       Wed Nov 06 10:23:06 2019 +0000
+++ b/sys/dev/sdmmc/sbt.c       Wed Nov 06 10:25:26 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sbt.c,v 1.5 2016/07/14 04:00:46 msaitoh Exp $  */
+/*     $NetBSD: sbt.c,v 1.5.10.1 2019/11/06 10:25:27 martin Exp $      */
 /*     $OpenBSD: sbt.c,v 1.9 2007/06/19 07:59:57 uwe Exp $     */
 
 /*
@@ -20,7 +20,7 @@
 /* Driver for Type-A/B SDIO Bluetooth cards */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbt.c,v 1.5 2016/07/14 04:00:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbt.c,v 1.5.10.1 2019/11/06 10:25:27 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -357,7 +357,7 @@
                m->m_len = MIN(MHLEN, m->m_pkthdr.len);
        } else {
                DPRINTF(("%s: sbt_intr: m_copyback failed\n", DEVNAME(sc)));
-               m_free(m);
+               m_freem(m);
                m = NULL;
        }
 
@@ -383,7 +383,7 @@
                        DPRINTF(("%s: recv 0x%x packet (%d bytes)\n",
                            DEVNAME(sc), sc->sc_buf[0], m->m_pkthdr.len));
                        sc->sc_stats.err_rx++;
-                       m_free(m);
+                       m_freem(m);
                        break;
                }
        } else
diff -r 86fbe4ab3035 -r 0075e35a502f sys/dev/usb/ubt.c
--- a/sys/dev/usb/ubt.c Wed Nov 06 10:23:06 2019 +0000
+++ b/sys/dev/usb/ubt.c Wed Nov 06 10:25:26 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ubt.c,v 1.59.2.1 2018/01/31 18:01:54 martin Exp $      */
+/*     $NetBSD: ubt.c,v 1.59.2.2 2019/11/06 10:25:26 martin Exp $      */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.59.2.1 2018/01/31 18:01:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.59.2.2 2019/11/06 10:25:26 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1528,7 +1528,7 @@
        m->m_pkthdr.len = m->m_len = MHLEN;
        m_copyback(m, 1, count, buf);   // (extends if necessary)
        if (m->m_pkthdr.len != MAX(MHLEN, count + 1)) {
-               m_free(m);
+               m_freem(m);
                return NULL;
        }