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

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

details:   https://anonhg.NetBSD.org/src/rev/5898377801fa
branches:  netbsd-9
changeset: 843525:5898377801fa
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Nov 18 19:46:33 2019 +0000

description:
Pull up following revision(s) (requested by nonaka in ticket #441):

        sys/dev/hyperv/if_hvn.c: revision 1.7
        sys/dev/pci/if_mcx.c: revision 1.6

Fixed incorrect m_defrag return value check.

diffstat:

 sys/dev/hyperv/if_hvn.c |  6 +++---
 sys/dev/pci/if_mcx.c    |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 05d7ed748579 -r 5898377801fa sys/dev/hyperv/if_hvn.c
--- a/sys/dev/hyperv/if_hvn.c   Mon Nov 18 19:45:00 2019 +0000
+++ b/sys/dev/hyperv/if_hvn.c   Mon Nov 18 19:46:33 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_hvn.c,v 1.4.2.1 2019/11/16 16:51:45 martin Exp $    */
+/*     $NetBSD: if_hvn.c,v 1.4.2.2 2019/11/18 19:46:33 martin Exp $    */
 /*     $OpenBSD: if_hvn.c,v 1.39 2018/03/11 14:31:34 mikeb Exp $       */
 
 /*-
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.4.2.1 2019/11/16 16:51:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.4.2.2 2019/11/18 19:46:33 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -565,7 +565,7 @@
        case 0:
                break;
        case EFBIG:
-               if (m_defrag(m, M_NOWAIT) == 0 &&
+               if (m_defrag(m, M_NOWAIT) != NULL &&
                    bus_dmamap_load_mbuf(sc->sc_dmat, txd->txd_dmap, m,
                      BUS_DMA_READ | BUS_DMA_NOWAIT) == 0)
                        break;
diff -r 05d7ed748579 -r 5898377801fa sys/dev/pci/if_mcx.c
--- a/sys/dev/pci/if_mcx.c      Mon Nov 18 19:45:00 2019 +0000
+++ b/sys/dev/pci/if_mcx.c      Mon Nov 18 19:46:33 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_mcx.c,v 1.1.2.4 2019/09/29 07:26:23 martin Exp $ */
+/*     $NetBSD: if_mcx.c,v 1.1.2.5 2019/11/18 19:46:33 martin Exp $ */
 /*     $OpenBSD: if_mcx.c,v 1.33 2019/09/12 04:23:59 jmatthew Exp $ */
 
 /*
@@ -6347,7 +6347,7 @@
                break;
 
        case EFBIG:
-               if (m_defrag(m, M_DONTWAIT) == 0 &&
+               if (m_defrag(m, M_DONTWAIT) != NULL &&
                    bus_dmamap_load_mbuf(sc->sc_dmat, ms->ms_map, m,
                    BUS_DMA_STREAMING | BUS_DMA_NOWAIT) == 0)
                        break;