[src/trunk]: src/sys/net Use m_remove_pkthdr.

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

details:   https://anonhg.NetBSD.org/src/rev/9814c7279701
branches:  trunk
changeset: 318855:9814c7279701
user:      maxv <maxv%NetBSD.org@localhost>
date:      Mon May 07 09:51:02 2018 +0000
description:
Use m_remove_pkthdr.

ok knakahara@ (for L2TP)

diffstat:

 sys/net/if_ieee1394subr.c |  7 +++----
 sys/net/if_l2tp.c         |  7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diffs (56 lines):

diff -r ab8d783f0034 -r 9814c7279701 sys/net/if_ieee1394subr.c
--- a/sys/net/if_ieee1394subr.c Mon May 07 09:41:10 2018 +0000
+++ b/sys/net/if_ieee1394subr.c Mon May 07 09:51:02 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ieee1394subr.c,v 1.60 2018/04/26 19:56:55 maxv Exp $        */
+/*     $NetBSD: if_ieee1394subr.c,v 1.61 2018/05/07 09:51:02 maxv Exp $        */
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.60 2018/04/26 19:56:55 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.61 2018/05/07 09:51:02 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -442,8 +442,7 @@
        len = m0->m_pkthdr.len;
        id = dgl | (src << 16);
        if (ftype & IEEE1394_FT_SUBSEQ) {
-               m_tag_delete_chain(m0, NULL);
-               m0->m_flags &= ~M_PKTHDR;
+               m_remove_pkthdr(m0);
                etype = 0;
                off = ntohs(ifh->ifh_etype_off);
        } else {
diff -r ab8d783f0034 -r 9814c7279701 sys/net/if_l2tp.c
--- a/sys/net/if_l2tp.c Mon May 07 09:41:10 2018 +0000
+++ b/sys/net/if_l2tp.c Mon May 07 09:51:02 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_l2tp.c,v 1.25 2018/05/01 07:21:39 maxv Exp $        */
+/*     $NetBSD: if_l2tp.c,v 1.26 2018/05/07 09:51:02 maxv Exp $        */
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.25 2018/05/01 07:21:39 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.26 2018/05/07 09:51:02 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -534,8 +534,7 @@
                         * Already copied mtag with M_COPY_PKTHDR.
                         * but don't delete mtag in case cut off M_PKTHDR flag
                         */
-                       m_tag_delete_chain(m, NULL);
-                       m->m_flags &= ~M_PKTHDR;
+                       m_remove_pkthdr(m);
                        m_head->m_next = m;
                }