Module Name: src
Committed By: maxv
Date: Mon May 7 09:51:03 UTC 2018
Modified Files:
src/sys/net: if_ieee1394subr.c if_l2tp.c
Log Message:
Use m_remove_pkthdr.
ok knakahara@ (for L2TP)
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/net/if_ieee1394subr.c
cvs rdiff -u -r1.25 -r1.26 src/sys/net/if_l2tp.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/net/if_ieee1394subr.c
diff -u src/sys/net/if_ieee1394subr.c:1.60 src/sys/net/if_ieee1394subr.c:1.61
--- src/sys/net/if_ieee1394subr.c:1.60 Thu Apr 26 19:56:55 2018
+++ src/sys/net/if_ieee1394subr.c Mon May 7 09:51:02 2018
@@ -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 @@ ieee1394_reass(struct ifnet *ifp, struct
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 {
Index: src/sys/net/if_l2tp.c
diff -u src/sys/net/if_l2tp.c:1.25 src/sys/net/if_l2tp.c:1.26
--- src/sys/net/if_l2tp.c:1.25 Tue May 1 07:21:39 2018
+++ src/sys/net/if_l2tp.c Mon May 7 09:51:02 2018
@@ -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 @@ l2tp_input(struct mbuf *m, struct ifnet
* 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;
}
