Module Name: src
Committed By: maxv
Date: Fri May 18 18:58:51 UTC 2018
Modified Files:
src/sys/netinet: dccp_usrreq.c ip_carp.c tcp_input.c tcp_sack.c
udp_usrreq.c
Log Message:
IP6_EXTHDR_GET -> M_REGION_GET, no functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/netinet/dccp_usrreq.c
cvs rdiff -u -r1.95 -r1.96 src/sys/netinet/ip_carp.c
cvs rdiff -u -r1.407 -r1.408 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.35 -r1.36 src/sys/netinet/tcp_sack.c
cvs rdiff -u -r1.251 -r1.252 src/sys/netinet/udp_usrreq.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/netinet/dccp_usrreq.c
diff -u src/sys/netinet/dccp_usrreq.c:1.18 src/sys/netinet/dccp_usrreq.c:1.19
--- src/sys/netinet/dccp_usrreq.c:1.18 Thu May 3 07:01:08 2018
+++ src/sys/netinet/dccp_usrreq.c Fri May 18 18:58:51 2018
@@ -1,5 +1,5 @@
/* $KAME: dccp_usrreq.c,v 1.67 2005/11/03 16:05:04 nishida Exp $ */
-/* $NetBSD: dccp_usrreq.c,v 1.18 2018/05/03 07:01:08 maxv Exp $ */
+/* $NetBSD: dccp_usrreq.c,v 1.19 2018/05/18 18:58:51 maxv Exp $ */
/*
* Copyright (c) 2003 Joacim H�ggmark, Magnus Erixzon, Nils-Erik Mattsson
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dccp_usrreq.c,v 1.18 2018/05/03 07:01:08 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dccp_usrreq.c,v 1.19 2018/05/18 18:58:51 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -230,7 +230,7 @@ dccp_input(struct mbuf *m, ...)
if (isipv6) {
DCCP_DEBUG((LOG_INFO, "Got DCCP ipv6 packet, iphlen = %u!\n", iphlen));
ip6 = mtod(m, struct ip6_hdr *);
- IP6_EXTHDR_GET(dh, struct dccphdr *, m, iphlen, sizeof(*dh));
+ M_REGION_GET(dh, struct dccphdr *, m, iphlen, sizeof(*dh));
if (dh == NULL) {
dccpstat.dccps_badlen++;
return;
@@ -256,7 +256,7 @@ dccp_input(struct mbuf *m, ...)
* Get IP and DCCP header together in first mbuf.
*/
ip = mtod(m, struct ip *);
- IP6_EXTHDR_GET(dh, struct dccphdr *, m, iphlen, sizeof(*dh));
+ M_REGION_GET(dh, struct dccphdr *, m, iphlen, sizeof(*dh));
if (dh == NULL) {
dccpstat.dccps_badlen++;
return;
Index: src/sys/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.95 src/sys/netinet/ip_carp.c:1.96
--- src/sys/netinet/ip_carp.c:1.95 Wed Mar 21 15:33:25 2018
+++ src/sys/netinet/ip_carp.c Fri May 18 18:58:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.95 2018/03/21 15:33:25 maxv Exp $ */
+/* $NetBSD: ip_carp.c,v 1.96 2018/05/18 18:58:51 maxv Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -33,7 +33,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.95 2018/03/21 15:33:25 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.96 2018/05/18 18:58:51 maxv Exp $");
/*
* TODO:
@@ -615,7 +615,7 @@ _carp6_proto_input(struct mbuf *m, int o
/* verify that we have a complete carp packet */
len = m->m_len;
- IP6_EXTHDR_GET(ch, struct carp_header *, m, off, sizeof(*ch));
+ M_REGION_GET(ch, struct carp_header *, m, off, sizeof(*ch));
if (ch == NULL) {
CARP_STATINC(CARP_STAT_BADLEN);
CARP_LOG(sc, ("packet size %u too small", len));
Index: src/sys/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.407 src/sys/netinet/tcp_input.c:1.408
--- src/sys/netinet/tcp_input.c:1.407 Thu May 3 07:13:48 2018
+++ src/sys/netinet/tcp_input.c Fri May 18 18:58:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.407 2018/05/03 07:13:48 maxv Exp $ */
+/* $NetBSD: tcp_input.c,v 1.408 2018/05/18 18:58:51 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.407 2018/05/03 07:13:48 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.408 2018/05/18 18:58:51 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -200,7 +200,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_input.c,
#endif
#ifndef INET6
-/* always need ip6.h for IP6_EXTHDR_GET */
#include <netinet/ip6.h>
#endif
@@ -1238,7 +1237,7 @@ tcp_input(struct mbuf *m, ...)
}
#endif
- IP6_EXTHDR_GET(th, struct tcphdr *, m, toff, sizeof(struct tcphdr));
+ M_REGION_GET(th, struct tcphdr *, m, toff, sizeof(struct tcphdr));
if (th == NULL) {
TCP_STATINC(TCP_STAT_RCVSHORT);
return;
@@ -1336,7 +1335,7 @@ tcp_input(struct mbuf *m, ...)
tlen -= off;
if (off > sizeof(struct tcphdr)) {
- IP6_EXTHDR_GET(th, struct tcphdr *, m, toff, off);
+ M_REGION_GET(th, struct tcphdr *, m, toff, off);
if (th == NULL) {
TCP_STATINC(TCP_STAT_RCVSHORT);
return;
Index: src/sys/netinet/tcp_sack.c
diff -u src/sys/netinet/tcp_sack.c:1.35 src/sys/netinet/tcp_sack.c:1.36
--- src/sys/netinet/tcp_sack.c:1.35 Thu May 3 07:13:48 2018
+++ src/sys/netinet/tcp_sack.c Fri May 18 18:58:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_sack.c,v 1.35 2018/05/03 07:13:48 maxv Exp $ */
+/* $NetBSD: tcp_sack.c,v 1.36 2018/05/18 18:58:51 maxv Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v 1.35 2018/05/03 07:13:48 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v 1.36 2018/05/18 18:58:51 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -144,7 +144,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v
#endif
#ifndef INET6
-/* always need ip6.h for IP6_EXTHDR_GET */
#include <netinet/ip6.h>
#endif
Index: src/sys/netinet/udp_usrreq.c
diff -u src/sys/netinet/udp_usrreq.c:1.251 src/sys/netinet/udp_usrreq.c:1.252
--- src/sys/netinet/udp_usrreq.c:1.251 Sun May 13 18:39:06 2018
+++ src/sys/netinet/udp_usrreq.c Fri May 18 18:58:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: udp_usrreq.c,v 1.251 2018/05/13 18:39:06 maxv Exp $ */
+/* $NetBSD: udp_usrreq.c,v 1.252 2018/05/18 18:58:51 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.251 2018/05/13 18:39:06 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.252 2018/05/18 18:58:51 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -111,7 +111,6 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c
#endif
#ifndef INET6
-/* always need ip6.h for IP6_EXTHDR_GET */
#include <netinet/ip6.h>
#endif
@@ -337,7 +336,7 @@ udp_input(struct mbuf *m, ...)
* Get IP and UDP header together in first mbuf.
*/
ip = mtod(m, struct ip *);
- IP6_EXTHDR_GET(uh, struct udphdr *, m, iphlen, sizeof(struct udphdr));
+ M_REGION_GET(uh, struct udphdr *, m, iphlen, sizeof(struct udphdr));
if (uh == NULL) {
UDP_STATINC(UDP_STAT_HDROPS);
return;
@@ -403,7 +402,7 @@ udp_input(struct mbuf *m, ...)
}
ip = mtod(m, struct ip *);
- IP6_EXTHDR_GET(uh, struct udphdr *, m, iphlen, sizeof(struct udphdr));
+ M_REGION_GET(uh, struct udphdr *, m, iphlen, sizeof(struct udphdr));
if (uh == NULL) {
UDP_STATINC(UDP_STAT_HDROPS);
return;
