Module Name: src
Committed By: maxv
Date: Thu May 3 07:25:50 UTC 2018
Modified Files:
src/sys/kern: uipc_mbuf.c
src/sys/netinet: ip_reass.c
src/sys/netinet6: frag6.c
src/sys/sys: mbuf.h
Log Message:
Rename m_pkthdr_remove -> m_remove_pkthdr, to match the existing naming
convention, eg m_copy_pkthdr and m_move_pkthdr.
To generate a diff of this commit:
cvs rdiff -u -r1.212 -r1.213 src/sys/kern/uipc_mbuf.c
cvs rdiff -u -r1.15 -r1.16 src/sys/netinet/ip_reass.c
cvs rdiff -u -r1.72 -r1.73 src/sys/netinet6/frag6.c
cvs rdiff -u -r1.201 -r1.202 src/sys/sys/mbuf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_mbuf.c
diff -u src/sys/kern/uipc_mbuf.c:1.212 src/sys/kern/uipc_mbuf.c:1.213
--- src/sys/kern/uipc_mbuf.c:1.212 Sat Apr 28 08:34:45 2018
+++ src/sys/kern/uipc_mbuf.c Thu May 3 07:25:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_mbuf.c,v 1.212 2018/04/28 08:34:45 maxv Exp $ */
+/* $NetBSD: uipc_mbuf.c,v 1.213 2018/05/03 07:25:50 maxv Exp $ */
/*
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.212 2018/04/28 08:34:45 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.213 2018/05/03 07:25:50 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_mbuftrace.h"
@@ -1534,7 +1534,7 @@ m_defrag(struct mbuf *m, int how)
}
void
-m_pkthdr_remove(struct mbuf *m)
+m_remove_pkthdr(struct mbuf *m)
{
KASSERT(m->m_flags & M_PKTHDR);
Index: src/sys/netinet/ip_reass.c
diff -u src/sys/netinet/ip_reass.c:1.15 src/sys/netinet/ip_reass.c:1.16
--- src/sys/netinet/ip_reass.c:1.15 Wed Apr 11 07:15:12 2018
+++ src/sys/netinet/ip_reass.c Thu May 3 07:25:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_reass.c,v 1.15 2018/04/11 07:15:12 maxv Exp $ */
+/* $NetBSD: ip_reass.c,v 1.16 2018/05/03 07:25:49 maxv Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1993
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v 1.15 2018/04/11 07:15:12 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v 1.16 2018/05/03 07:25:49 maxv Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -389,7 +389,7 @@ insert:
t = q->ipqe_m;
nq = TAILQ_NEXT(q, ipqe_q);
pool_cache_put(ipfren_cache, q);
- m_pkthdr_remove(t);
+ m_remove_pkthdr(t);
m_cat(m, t);
}
Index: src/sys/netinet6/frag6.c
diff -u src/sys/netinet6/frag6.c:1.72 src/sys/netinet6/frag6.c:1.73
--- src/sys/netinet6/frag6.c:1.72 Tue May 1 07:21:39 2018
+++ src/sys/netinet6/frag6.c Thu May 3 07:25:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: frag6.c,v 1.72 2018/05/01 07:21:39 maxv Exp $ */
+/* $NetBSD: frag6.c,v 1.73 2018/05/03 07:25:49 maxv Exp $ */
/* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.72 2018/05/01 07:21:39 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.73 2018/05/03 07:25:49 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -439,7 +439,7 @@ insert:
t = t->m_next;
t->m_next = af6->ip6af_m;
m_adj(t->m_next, af6->ip6af_offset);
- m_pkthdr_remove(t->m_next);
+ m_remove_pkthdr(t->m_next);
kmem_intr_free(af6, sizeof(struct ip6asfrag));
af6 = af6dwn;
}
Index: src/sys/sys/mbuf.h
diff -u src/sys/sys/mbuf.h:1.201 src/sys/sys/mbuf.h:1.202
--- src/sys/sys/mbuf.h:1.201 Thu May 3 07:01:08 2018
+++ src/sys/sys/mbuf.h Thu May 3 07:25:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mbuf.h,v 1.201 2018/05/03 07:01:08 maxv Exp $ */
+/* $NetBSD: mbuf.h,v 1.202 2018/05/03 07:25:49 maxv Exp $ */
/*
* Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -764,8 +764,6 @@ extern struct mowner revoked_mowner;
MALLOC_DECLARE(M_MBUF);
MALLOC_DECLARE(M_SONAME);
-void m_pkthdr_remove(struct mbuf *);
-
struct mbuf *m_copym(struct mbuf *, int, int, int);
struct mbuf *m_copypacket(struct mbuf *, int);
struct mbuf *m_devget(char *, int, int, struct ifnet *,
@@ -794,6 +792,7 @@ void m_verify_packet(struct mbuf *);
struct mbuf *m_free(struct mbuf *);
void m_freem(struct mbuf *);
void mbinit(void);
+void m_remove_pkthdr(struct mbuf *);
void m_copy_pkthdr(struct mbuf *, struct mbuf *);
void m_move_pkthdr(struct mbuf *, struct mbuf *);
