Module Name: src
Committed By: martin
Date: Mon Nov 18 19:46:33 UTC 2019
Modified Files:
src/sys/dev/hyperv [netbsd-9]: if_hvn.c
src/sys/dev/pci [netbsd-9]: if_mcx.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 src/sys/dev/hyperv/if_hvn.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/dev/pci/if_mcx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/hyperv/if_hvn.c
diff -u src/sys/dev/hyperv/if_hvn.c:1.4.2.1 src/sys/dev/hyperv/if_hvn.c:1.4.2.2
--- src/sys/dev/hyperv/if_hvn.c:1.4.2.1 Sat Nov 16 16:51:45 2019
+++ src/sys/dev/hyperv/if_hvn.c Mon Nov 18 19:46:33 2019
@@ -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 @@ hvn_encap(struct hvn_softc *sc, struct m
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;
Index: src/sys/dev/pci/if_mcx.c
diff -u src/sys/dev/pci/if_mcx.c:1.1.2.4 src/sys/dev/pci/if_mcx.c:1.1.2.5
--- src/sys/dev/pci/if_mcx.c:1.1.2.4 Sun Sep 29 07:26:23 2019
+++ src/sys/dev/pci/if_mcx.c Mon Nov 18 19:46:33 2019
@@ -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 @@ mcx_load_mbuf(struct mcx_softc *sc, stru
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;
