Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arm/imx Don't remove M_PKTHDR manually...



details:   https://anonhg.NetBSD.org/src/rev/cd9e518bd888
branches:  trunk
changeset: 318872:cd9e518bd888
user:      maxv <maxv%NetBSD.org@localhost>
date:      Tue May 08 06:11:45 2018 +0000
description:
Don't remove M_PKTHDR manually, use m_remove_pkthdr instead.

ok ryo@

diffstat:

 sys/arch/arm/imx/if_enet.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 7ac6c046b02e -r cd9e518bd888 sys/arch/arm/imx/if_enet.c
--- a/sys/arch/arm/imx/if_enet.c        Tue May 08 06:08:19 2018 +0000
+++ b/sys/arch/arm/imx/if_enet.c        Tue May 08 06:11:45 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_enet.c,v 1.12 2018/02/16 08:42:45 ryo Exp $ */
+/*     $NetBSD: if_enet.c,v 1.13 2018/05/08 06:11:45 maxv Exp $        */
 
 /*
  * Copyright (c) 2014 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.12 2018/02/16 08:42:45 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.13 2018/05/08 06:11:45 maxv Exp $");
 
 #include "vlan.h"
 
@@ -607,7 +607,8 @@
 
                        m->m_len = len;
                        amount += len;
-                       m->m_flags &= ~M_PKTHDR;
+                       if (m->m_flags & M_PKTHDR)
+                               m_remove_pkthdr(m);
                        mprev->m_next = m;
                }
                mprev = m;



Home | Main Index | Thread Index | Old Index