Module Name: src
Committed By: christos
Date: Sat Dec 31 20:42:00 UTC 2011
Modified Files:
src/sys/ddb: db_user.h
src/sys/net: rtsock.c
src/sys/net80211: ieee80211_input.c ieee80211_ioctl.c
ieee80211_netbsd.h ieee80211_output.c
src/sys/netinet: if_arp.c ip_icmp.c ip_output.c tcp_input.c
tcp_output.c tcp_subr.c
src/sys/netinet6: frag6.c icmp6.c in6_ifattach.c in6_pcb.c in6_proto.c
ip6_input.c ip6_mroute.c ip6_output.c
src/sys/netkey: key.c
Log Message:
- fix offsetof usage, and redundant defines
- kill pointer casts to 0
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/ddb/db_user.h
cvs rdiff -u -r1.138 -r1.139 src/sys/net/rtsock.c
cvs rdiff -u -r1.71 -r1.72 src/sys/net80211/ieee80211_input.c
cvs rdiff -u -r1.56 -r1.57 src/sys/net80211/ieee80211_ioctl.c
cvs rdiff -u -r1.16 -r1.17 src/sys/net80211/ieee80211_netbsd.h
cvs rdiff -u -r1.50 -r1.51 src/sys/net80211/ieee80211_output.c
cvs rdiff -u -r1.152 -r1.153 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.126 -r1.127 src/sys/netinet/ip_icmp.c
cvs rdiff -u -r1.211 -r1.212 src/sys/netinet/ip_output.c
cvs rdiff -u -r1.319 -r1.320 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.172 -r1.173 src/sys/netinet/tcp_output.c
cvs rdiff -u -r1.245 -r1.246 src/sys/netinet/tcp_subr.c
cvs rdiff -u -r1.51 -r1.52 src/sys/netinet6/frag6.c
cvs rdiff -u -r1.158 -r1.159 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.86 -r1.87 src/sys/netinet6/in6_ifattach.c
cvs rdiff -u -r1.117 -r1.118 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.94 -r1.95 src/sys/netinet6/in6_proto.c
cvs rdiff -u -r1.134 -r1.135 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.102 -r1.103 src/sys/netinet6/ip6_mroute.c
cvs rdiff -u -r1.141 -r1.142 src/sys/netinet6/ip6_output.c
cvs rdiff -u -r1.180 -r1.181 src/sys/netkey/key.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/ddb/db_user.h
diff -u src/sys/ddb/db_user.h:1.2 src/sys/ddb/db_user.h:1.3
--- src/sys/ddb/db_user.h:1.2 Tue Feb 2 04:04:14 2010
+++ src/sys/ddb/db_user.h Sat Dec 31 15:41:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_user.h,v 1.2 2010/02/02 09:04:14 tron Exp $ */
+/* $NetBSD: db_user.h,v 1.3 2011/12/31 20:41:58 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -54,11 +54,6 @@
typedef jmp_buf label_t;
-#ifndef offsetof
-#define offsetof(type, member) \
- ((size_t)(unsigned long)(&(((type *)0)->member)))
-#endif
-
int cngetc(void);
void cnputc(int);
Index: src/sys/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.138 src/sys/net/rtsock.c:1.139
--- src/sys/net/rtsock.c:1.138 Sun Dec 11 19:06:39 2011
+++ src/sys/net/rtsock.c Sat Dec 31 15:41:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock.c,v 1.138 2011/12/12 00:06:39 roy Exp $ */
+/* $NetBSD: rtsock.c,v 1.139 2011/12/31 20:41:58 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.138 2011/12/12 00:06:39 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.139 2011/12/31 20:41:58 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -854,11 +854,13 @@ COMPATNAME(rt_newaddrmsg)(int cmd, struc
const struct sockaddr *sa;
int pass;
struct mbuf *m;
- struct ifnet *ifp = ifa->ifa_ifp;
+ struct ifnet *ifp;
struct rt_xmsghdr rtm;
struct ifa_xmsghdr ifam;
int ncmd;
+ KASSERT(ifa != NULL);
+ ifp = ifa->ifa_ifp;
COMPATCALL(rt_newaddrmsg, (cmd, ifa, error, rt));
if (COMPATNAME(route_info).ri_cb.any_count == 0)
return;
@@ -885,6 +887,7 @@ COMPATNAME(rt_newaddrmsg)(int cmd, struc
ncmd = cmd;
}
info.rti_info[RTAX_IFA] = sa = ifa->ifa_addr;
+ KASSERT(ifp->if_dl != NULL);
info.rti_info[RTAX_IFP] = ifp->if_dl->ifa_addr;
info.rti_info[RTAX_NETMASK] = ifa->ifa_netmask;
info.rti_info[RTAX_BRD] = ifa->ifa_dstaddr;
Index: src/sys/net80211/ieee80211_input.c
diff -u src/sys/net80211/ieee80211_input.c:1.71 src/sys/net80211/ieee80211_input.c:1.72
--- src/sys/net80211/ieee80211_input.c:1.71 Sun Jul 17 16:54:52 2011
+++ src/sys/net80211/ieee80211_input.c Sat Dec 31 15:41:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_input.c,v 1.71 2011/07/17 20:54:52 joerg Exp $ */
+/* $NetBSD: ieee80211_input.c,v 1.72 2011/12/31 20:41:58 christos Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.81 2005/08/10 16:22:29 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.71 2011/07/17 20:54:52 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.72 2011/12/31 20:41:58 christos Exp $");
#endif
#include "opt_inet.h"
@@ -1732,12 +1732,12 @@ ieee80211_parse_wmeparams(struct ieee802
wh, "WME", "too short, len %u", len);
return -1;
}
- qosinfo = frm[__offsetof(struct ieee80211_wme_param, param_qosInfo)];
+ qosinfo = frm[offsetof(struct ieee80211_wme_param, param_qosInfo)];
qosinfo &= WME_QOSINFO_COUNT;
/* XXX do proper check for wraparound */
if (qosinfo == wme->wme_wmeChanParams.cap_info)
return 0;
- frm += __offsetof(struct ieee80211_wme_param, params_acParams);
+ frm += offsetof(struct ieee80211_wme_param, params_acParams);
for (i = 0; i < WME_NUM_AC; i++) {
struct wmeParams *wmep =
&wme->wme_wmeChanParams.cap_wmeParams[i];
Index: src/sys/net80211/ieee80211_ioctl.c
diff -u src/sys/net80211/ieee80211_ioctl.c:1.56 src/sys/net80211/ieee80211_ioctl.c:1.57
--- src/sys/net80211/ieee80211_ioctl.c:1.56 Sat Jun 11 20:07:19 2011
+++ src/sys/net80211/ieee80211_ioctl.c Sat Dec 31 15:41:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_ioctl.c,v 1.56 2011/06/12 00:07:19 christos Exp $ */
+/* $NetBSD: ieee80211_ioctl.c,v 1.57 2011/12/31 20:41:58 christos Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.35 2005/08/30 14:27:47 avatar Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.56 2011/06/12 00:07:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.57 2011/12/31 20:41:58 christos Exp $");
#endif
/*
@@ -962,7 +962,7 @@ ieee80211_ioctl_getchaninfo(struct ieee8
chans->ic_chans[chans->ic_nchans].ic_flags = c->ic_flags;
chans->ic_nchans++;
}
- space = __offsetof(struct ieee80211req_chaninfo,
+ space = offsetof(struct ieee80211req_chaninfo,
ic_chans[chans->ic_nchans]);
if (space > ireq->i_len)
space = ireq->i_len;
@@ -1004,7 +1004,7 @@ ieee80211_ioctl_getstastats(struct ieee8
{
struct ieee80211_node *ni;
u_int8_t macaddr[IEEE80211_ADDR_LEN];
- const size_t off = __offsetof(struct ieee80211req_sta_stats, is_stats);
+ const size_t off = offsetof(struct ieee80211req_sta_stats, is_stats);
int error;
if (ireq->i_len < off)
Index: src/sys/net80211/ieee80211_netbsd.h
diff -u src/sys/net80211/ieee80211_netbsd.h:1.16 src/sys/net80211/ieee80211_netbsd.h:1.17
--- src/sys/net80211/ieee80211_netbsd.h:1.16 Fri Oct 7 12:51:45 2011
+++ src/sys/net80211/ieee80211_netbsd.h Sat Dec 31 15:41:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_netbsd.h,v 1.16 2011/10/07 16:51:45 dyoung Exp $ */
+/* $NetBSD: ieee80211_netbsd.h,v 1.17 2011/12/31 20:41:58 christos Exp $ */
/*-
* Copyright (c) 2003-2005 Sam Leffler, Errno Consulting
* All rights reserved.
@@ -230,7 +230,6 @@ struct ieee80211_michael_event {
#define RTM_IEEE80211_REJOIN 108 /* station re-associate (ap mode) */
#ifdef _KERNEL
-#define __offsetof offsetof
#define ticks hardclock_ticks
#define ovbcopy(__src, __dst, __n) ((void)memmove(__dst, __src, __n))
Index: src/sys/net80211/ieee80211_output.c
diff -u src/sys/net80211/ieee80211_output.c:1.50 src/sys/net80211/ieee80211_output.c:1.51
--- src/sys/net80211/ieee80211_output.c:1.50 Mon Feb 21 18:50:08 2011
+++ src/sys/net80211/ieee80211_output.c Sat Dec 31 15:41:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_output.c,v 1.50 2011/02/21 23:50:08 jmcneill Exp $ */
+/* $NetBSD: ieee80211_output.c,v 1.51 2011/12/31 20:41:58 christos Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.34 2005/08/10 16:22:29 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_output.c,v 1.50 2011/02/21 23:50:08 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_output.c,v 1.51 2011/12/31 20:41:58 christos Exp $");
#endif
#include "opt_inet.h"
@@ -1258,7 +1258,7 @@ ieee80211_add_wme_param(u_int8_t *frm, s
int i;
memcpy(frm, ¶m, sizeof(param));
- frm += __offsetof(struct ieee80211_wme_info, wme_info);
+ frm += offsetof(struct ieee80211_wme_info, wme_info);
*frm++ = wme->wme_bssChanParams.cap_info; /* AC info */
*frm++ = 0; /* reserved field */
for (i = 0; i < WME_NUM_AC; i++) {
Index: src/sys/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.152 src/sys/netinet/if_arp.c:1.153
--- src/sys/netinet/if_arp.c:1.152 Sat Aug 27 05:05:54 2011
+++ src/sys/netinet/if_arp.c Sat Dec 31 15:41:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.152 2011/08/27 09:05:54 christos Exp $ */
+/* $NetBSD: if_arp.c,v 1.153 2011/12/31 20:41:58 christos Exp $ */
/*-
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.152 2011/08/27 09:05:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.153 2011/12/31 20:41:58 christos Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -1238,7 +1238,7 @@ reply:
arps[ARP_STAT_SNDTOTAL]++;
arps[ARP_STAT_SNDREPLY]++;
ARP_STAT_PUTREF();
- (*ifp->if_output)(ifp, m, &sa, (struct rtentry *)0);
+ (*ifp->if_output)(ifp, m, &sa, NULL);
return;
}
Index: src/sys/netinet/ip_icmp.c
diff -u src/sys/netinet/ip_icmp.c:1.126 src/sys/netinet/ip_icmp.c:1.127
--- src/sys/netinet/ip_icmp.c:1.126 Mon Dec 19 06:59:56 2011
+++ src/sys/netinet/ip_icmp.c Sat Dec 31 15:41:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_icmp.c,v 1.126 2011/12/19 11:59:56 drochner Exp $ */
+/* $NetBSD: ip_icmp.c,v 1.127 2011/12/31 20:41:58 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.126 2011/12/19 11:59:56 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.127 2011/12/31 20:41:58 christos Exp $");
#include "opt_ipsec.h"
@@ -1111,8 +1111,7 @@ icmp_mtudisc(struct icmp *icp, struct in
struct rtentry *nrt;
error = rtrequest((int) RTM_ADD, dst,
- (struct sockaddr *) rt->rt_gateway,
- (struct sockaddr *) 0,
+ (struct sockaddr *) rt->rt_gateway, NULL,
RTF_GATEWAY | RTF_HOST | RTF_DYNAMIC, &nrt);
if (error) {
rtfree(rt);
Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.211 src/sys/netinet/ip_output.c:1.212
--- src/sys/netinet/ip_output.c:1.211 Mon Dec 19 06:59:57 2011
+++ src/sys/netinet/ip_output.c Sat Dec 31 15:41:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_output.c,v 1.211 2011/12/19 11:59:57 drochner Exp $ */
+/* $NetBSD: ip_output.c,v 1.212 2011/12/31 20:41:59 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.211 2011/12/19 11:59:57 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.212 2011/12/31 20:41:59 christos Exp $");
#include "opt_pfil_hooks.h"
#include "opt_inet.h"
@@ -1006,7 +1006,7 @@ ip_fragment(struct mbuf *m, struct ifnet
goto sendorfree;
}
m->m_pkthdr.len = mhlen + len;
- m->m_pkthdr.rcvif = (struct ifnet *)0;
+ m->m_pkthdr.rcvif = NULL;
mhip->ip_sum = 0;
KASSERT((m->m_pkthdr.csum_flags & M_CSUM_IPv4) == 0);
if (sw_csum & M_CSUM_IPv4) {
Index: src/sys/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.319 src/sys/netinet/tcp_input.c:1.320
--- src/sys/netinet/tcp_input.c:1.319 Mon Dec 19 06:59:57 2011
+++ src/sys/netinet/tcp_input.c Sat Dec 31 15:41:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.319 2011/12/19 11:59:57 drochner Exp $ */
+/* $NetBSD: tcp_input.c,v 1.320 2011/12/31 20:41:59 christos 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.319 2011/12/19 11:59:57 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.320 2011/12/31 20:41:59 christos Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -2261,7 +2261,7 @@ after_listen:
tp->rcv_scale = tp->request_r_scale;
}
TCP_REASS_LOCK(tp);
- (void) tcp_reass(tp, NULL, (struct mbuf *)0, &tlen);
+ (void) tcp_reass(tp, NULL, NULL, &tlen);
/*
* if we didn't have to retransmit the SYN,
* use its rtt as our initial srtt & rtt var.
@@ -2585,7 +2585,7 @@ after_listen:
tp->rcv_scale = tp->request_r_scale;
}
TCP_REASS_LOCK(tp);
- (void) tcp_reass(tp, NULL, (struct mbuf *)0, &tlen);
+ (void) tcp_reass(tp, NULL, NULL, &tlen);
tp->snd_wl1 = th->th_seq - 1;
/* fall into ... */
Index: src/sys/netinet/tcp_output.c
diff -u src/sys/netinet/tcp_output.c:1.172 src/sys/netinet/tcp_output.c:1.173
--- src/sys/netinet/tcp_output.c:1.172 Mon Dec 19 06:59:57 2011
+++ src/sys/netinet/tcp_output.c Sat Dec 31 15:41:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_output.c,v 1.172 2011/12/19 11:59:57 drochner Exp $ */
+/* $NetBSD: tcp_output.c,v 1.173 2011/12/31 20:41:59 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -135,7 +135,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.172 2011/12/19 11:59:57 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.173 2011/12/31 20:41:59 christos Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -1288,7 +1288,7 @@ send:
m->m_data += max_linkhdr;
m->m_len = hdrlen;
}
- m->m_pkthdr.rcvif = (struct ifnet *)0;
+ m->m_pkthdr.rcvif = NULL;
switch (af) {
#ifdef INET
case AF_INET:
@@ -1605,8 +1605,7 @@ timer:
opts = NULL;
error = ip_output(m, opts, ro,
(tp->t_mtudisc ? IP_MTUDISC : 0) |
- (so->so_options & SO_DONTROUTE),
- (struct ip_moptions *)0, so);
+ (so->so_options & SO_DONTROUTE), NULL, so);
break;
}
#endif
Index: src/sys/netinet/tcp_subr.c
diff -u src/sys/netinet/tcp_subr.c:1.245 src/sys/netinet/tcp_subr.c:1.246
--- src/sys/netinet/tcp_subr.c:1.245 Mon Dec 19 06:59:57 2011
+++ src/sys/netinet/tcp_subr.c Sat Dec 31 15:41:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_subr.c,v 1.245 2011/12/19 11:59:57 drochner Exp $ */
+/* $NetBSD: tcp_subr.c,v 1.246 2011/12/31 20:41:59 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.245 2011/12/19 11:59:57 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.246 2011/12/31 20:41:59 christos Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -829,7 +829,7 @@ tcp_respond(struct tcpcb *tp, struct mbu
tlen += th->th_off << 2;
m->m_len = hlen + tlen;
m->m_pkthdr.len = hlen + tlen;
- m->m_pkthdr.rcvif = (struct ifnet *) 0;
+ m->m_pkthdr.rcvif = NULL;
th->th_flags = flags;
th->th_urp = 0;
@@ -922,8 +922,7 @@ tcp_respond(struct tcpcb *tp, struct mbu
#ifdef INET
case AF_INET:
error = ip_output(m, NULL, ro,
- (tp && tp->t_mtudisc ? IP_MTUDISC : 0),
- (struct ip_moptions *)0, so);
+ (tp && tp->t_mtudisc ? IP_MTUDISC : 0), NULL, so);
break;
#endif
#ifdef INET6
@@ -1275,7 +1274,7 @@ tcp_close(struct tcpcb *tp)
callout_destroy(&tp->t_delack_ch);
pool_put(&tcpcb_pool, tp);
- return ((struct tcpcb *)0);
+ return NULL;
}
int
Index: src/sys/netinet6/frag6.c
diff -u src/sys/netinet6/frag6.c:1.51 src/sys/netinet6/frag6.c:1.52
--- src/sys/netinet6/frag6.c:1.51 Thu Dec 15 19:57:59 2011
+++ src/sys/netinet6/frag6.c Sat Dec 31 15:41:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: frag6.c,v 1.51 2011/12/16 00:57:59 jakllsch Exp $ */
+/* $NetBSD: frag6.c,v 1.52 2011/12/31 20:41:59 christos 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.51 2011/12/16 00:57:59 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.52 2011/12/31 20:41:59 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,10 +72,6 @@ struct ip6q ip6q; /* ip6 reassemble queu
static kmutex_t frag6_lock;
-#ifndef offsetof /* XXX */
-#define offsetof(type, member) ((size_t)(&((type *)0)->member))
-#endif
-
/*
* Initialise reassembly queue and fragment identifier.
*/
Index: src/sys/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.158 src/sys/netinet6/icmp6.c:1.159
--- src/sys/netinet6/icmp6.c:1.158 Mon Dec 19 06:59:57 2011
+++ src/sys/netinet6/icmp6.c Sat Dec 31 15:41:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.158 2011/12/19 11:59:57 drochner Exp $ */
+/* $NetBSD: icmp6.c,v 1.159 2011/12/31 20:41:59 christos Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.158 2011/12/19 11:59:57 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.159 2011/12/31 20:41:59 christos Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -1162,9 +1162,6 @@ icmp6_mtudisc_update(struct ip6ctlparam
* - joins NI group address at in6_ifattach() time only, does not cope
* with hostname changes by sethostname(3)
*/
-#ifndef offsetof /* XXX */
-#define offsetof(type, member) ((size_t)(&((type *)0)->member))
-#endif
static struct mbuf *
ni6_input(struct mbuf *m, int off)
{
@@ -2690,8 +2687,7 @@ icmp6_mtudisc_clone(struct sockaddr *dst
struct rtentry *nrt;
error = rtrequest((int) RTM_ADD, dst,
- (struct sockaddr *) rt->rt_gateway,
- (struct sockaddr *) 0,
+ (struct sockaddr *) rt->rt_gateway, NULL,
RTF_GATEWAY | RTF_HOST | RTF_DYNAMIC, &nrt);
if (error) {
rtfree(rt);
Index: src/sys/netinet6/in6_ifattach.c
diff -u src/sys/netinet6/in6_ifattach.c:1.86 src/sys/netinet6/in6_ifattach.c:1.87
--- src/sys/netinet6/in6_ifattach.c:1.86 Sat Nov 19 17:51:29 2011
+++ src/sys/netinet6/in6_ifattach.c Sat Dec 31 15:41:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_ifattach.c,v 1.86 2011/11/19 22:51:29 tls Exp $ */
+/* $NetBSD: in6_ifattach.c,v 1.87 2011/12/31 20:41:59 christos Exp $ */
/* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.86 2011/11/19 22:51:29 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.87 2011/12/31 20:41:59 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -884,7 +884,7 @@ in6_ifdetach(struct ifnet *ifp)
rtrequest(RTM_DELETE, (struct sockaddr *)&ia->ia_addr,
(struct sockaddr *)&ia->ia_addr,
(struct sockaddr *)&ia->ia_prefixmask,
- rtflags, (struct rtentry **)0);
+ rtflags, NULL);
}
/* remove from the linked list */
Index: src/sys/netinet6/in6_pcb.c
diff -u src/sys/netinet6/in6_pcb.c:1.117 src/sys/netinet6/in6_pcb.c:1.118
--- src/sys/netinet6/in6_pcb.c:1.117 Mon Dec 19 06:59:58 2011
+++ src/sys/netinet6/in6_pcb.c Sat Dec 31 15:41:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_pcb.c,v 1.117 2011/12/19 11:59:58 drochner Exp $ */
+/* $NetBSD: in6_pcb.c,v 1.118 2011/12/31 20:41:59 christos Exp $ */
/* $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.117 2011/12/19 11:59:58 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.118 2011/12/31 20:41:59 christos Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -542,7 +542,7 @@ in6_pcbconnect(void *v, struct mbuf *nam
in6p->in6p_laddr.s6_addr32[3] == 0))
{
if (in6p->in6p_lport == 0) {
- error = in6_pcbbind(in6p, (struct mbuf *)0, l);
+ error = in6_pcbbind(in6p, NULL, l);
if (error != 0)
return error;
}
Index: src/sys/netinet6/in6_proto.c
diff -u src/sys/netinet6/in6_proto.c:1.94 src/sys/netinet6/in6_proto.c:1.95
--- src/sys/netinet6/in6_proto.c:1.94 Mon Dec 19 06:59:58 2011
+++ src/sys/netinet6/in6_proto.c Sat Dec 31 15:41:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_proto.c,v 1.94 2011/12/19 11:59:58 drochner Exp $ */
+/* $NetBSD: in6_proto.c,v 1.95 2011/12/31 20:41:59 christos Exp $ */
/* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.94 2011/12/19 11:59:58 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.95 2011/12/31 20:41:59 christos Exp $");
#include "opt_gateway.h"
#include "opt_inet.h"
@@ -137,10 +137,6 @@ __KERNEL_RCSID(0, "$NetBSD: in6_proto.c,
#include <net/net_osdep.h>
-#ifndef offsetof /* XXX */
-#define offsetof(type, member) ((size_t)(&((type *)0)->member))
-#endif
-
/*
* TCP/IP protocol family: IP6, ICMP6, UDP, TCP.
*/
@@ -481,7 +477,7 @@ int ip6_mcast_pmtu = 0; /* enable pMTU d
int ip6_v6only = 1;
int ip6_keepfaith = 0;
-time_t ip6_log_time = (time_t)0L;
+time_t ip6_log_time = 0;
int ip6_rtadv_maxroutes = 100; /* (arbitrary) initial maximum number of
* routes via rtadv expected to be
* significantly larger than common use.
Index: src/sys/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.134 src/sys/netinet6/ip6_input.c:1.135
--- src/sys/netinet6/ip6_input.c:1.134 Mon Dec 19 06:59:58 2011
+++ src/sys/netinet6/ip6_input.c Sat Dec 31 15:41:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_input.c,v 1.134 2011/12/19 11:59:58 drochner Exp $ */
+/* $NetBSD: ip6_input.c,v 1.135 2011/12/31 20:41:59 christos Exp $ */
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.134 2011/12/19 11:59:58 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.135 2011/12/31 20:41:59 christos Exp $");
#include "opt_gateway.h"
#include "opt_inet.h"
@@ -193,7 +193,7 @@ ip6_init(void)
frag6_init();
ip6_desync_factor = cprng_fast32() % MAX_TEMP_DESYNC_FACTOR;
- ip6_init2((void *)0);
+ ip6_init2(NULL);
#ifdef GATEWAY
ip6flow_init(ip6_hashsize);
#endif
Index: src/sys/netinet6/ip6_mroute.c
diff -u src/sys/netinet6/ip6_mroute.c:1.102 src/sys/netinet6/ip6_mroute.c:1.103
--- src/sys/netinet6/ip6_mroute.c:1.102 Tue Oct 18 21:53:07 2011
+++ src/sys/netinet6/ip6_mroute.c Sat Dec 31 15:41:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_mroute.c,v 1.102 2011/10/19 01:53:07 dyoung Exp $ */
+/* $NetBSD: ip6_mroute.c,v 1.103 2011/12/31 20:41:59 christos Exp $ */
/* $KAME: ip6_mroute.c,v 1.49 2001/07/25 09:21:18 jinmei Exp $ */
/*
@@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.102 2011/10/19 01:53:07 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.103 2011/12/31 20:41:59 christos Exp $");
#include "opt_inet.h"
#include "opt_mrouting.h"
@@ -1018,8 +1018,7 @@ socket_send(struct socket *s, struct mbu
{
if (s) {
if (sbappendaddr(&s->so_rcv,
- (struct sockaddr *)src,
- mm, (struct mbuf *)0) != 0) {
+ (struct sockaddr *)src, mm, NULL) != 0) {
sorwakeup(s);
return 0;
}
Index: src/sys/netinet6/ip6_output.c
diff -u src/sys/netinet6/ip6_output.c:1.141 src/sys/netinet6/ip6_output.c:1.142
--- src/sys/netinet6/ip6_output.c:1.141 Mon Dec 19 06:59:58 2011
+++ src/sys/netinet6/ip6_output.c Sat Dec 31 15:41:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_output.c,v 1.141 2011/12/19 11:59:58 drochner Exp $ */
+/* $NetBSD: ip6_output.c,v 1.142 2011/12/31 20:41:59 christos Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.141 2011/12/19 11:59:58 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.142 2011/12/31 20:41:59 christos Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -1120,7 +1120,7 @@ skip_ipsec2:;
;
mlast->m_next = m_frgpart;
m->m_pkthdr.len = len + hlen + sizeof(*ip6f);
- m->m_pkthdr.rcvif = (struct ifnet *)0;
+ m->m_pkthdr.rcvif = NULL;
ip6f->ip6f_reserved = 0;
ip6f->ip6f_ident = id;
ip6f->ip6f_nxt = nextproto;
Index: src/sys/netkey/key.c
diff -u src/sys/netkey/key.c:1.180 src/sys/netkey/key.c:1.181
--- src/sys/netkey/key.c:1.180 Sat Nov 19 17:51:30 2011
+++ src/sys/netkey/key.c Sat Dec 31 15:42:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.180 2011/11/19 22:51:30 tls Exp $ */
+/* $NetBSD: key.c,v 1.181 2011/12/31 20:42:00 christos Exp $ */
/* $KAME: key.c,v 1.310 2003/09/08 02:23:44 itojun Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.180 2011/11/19 22:51:30 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.181 2011/12/31 20:42:00 christos Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -100,9 +100,6 @@ __KERNEL_RCSID(0, "$NetBSD: key.c,v 1.18
#include <net/net_osdep.h>
-#ifndef offsetof
-#define offsetof(type, member) ((size_t)(&((type *)0)->member))
-#endif
#ifndef satosin
#define satosin(s) ((struct sockaddr_in *)s)
#endif
