svn commit: r186791 - in head/sys: netinet6 netipsec
Bjoern A. Zeeb
bz at FreeBSD.org
Mon Jan 5 12:29:02 PST 2009
Author: bz
Date: Mon Jan 5 20:29:01 2009
New Revision: 186791
URL: http://svn.freebsd.org/changeset/base/186791
Log:
Switch the last protosw* structs to C99 initializers.
Reviewed by: ed, julian, Christoph Mallon <christoph.mallon at gmx.de>
MFC after: 2 weeks
Modified:
head/sys/netinet6/in6_gif.c
head/sys/netipsec/xform_ipip.c
Modified: head/sys/netinet6/in6_gif.c
==============================================================================
--- head/sys/netinet6/in6_gif.c Mon Jan 5 20:23:01 2009 (r186790)
+++ head/sys/netinet6/in6_gif.c Mon Jan 5 20:29:01 2009 (r186791)
@@ -75,11 +75,15 @@ static int gif_validate6(const struct ip
struct ifnet *);
extern struct domain inet6domain;
-struct ip6protosw in6_gif_protosw =
-{ SOCK_RAW, &inet6domain, 0/* IPPROTO_IPV[46] */, PR_ATOMIC|PR_ADDR,
- in6_gif_input, rip6_output, 0, rip6_ctloutput,
- 0, 0, 0, 0,
- &rip6_usrreqs
+struct ip6protosw in6_gif_protosw = {
+ .pr_type = SOCK_RAW,
+ .pr_domain = &inet6domain,
+ .pr_protocol = 0, /* IPPROTO_IPV[46] */
+ .pr_flags = PR_ATOMIC|PR_ADDR,
+ .pr_input = in6_gif_input,
+ .pr_output = rip6_output,
+ .pr_ctloutput = rip6_ctloutput,
+ .pr_usrreqs = &rip6_usrreqs
};
int
Modified: head/sys/netipsec/xform_ipip.c
==============================================================================
--- head/sys/netipsec/xform_ipip.c Mon Jan 5 20:23:01 2009 (r186790)
+++ head/sys/netipsec/xform_ipip.c Mon Jan 5 20:29:01 2009 (r186791)
@@ -660,20 +660,24 @@ static struct xformsw ipe4_xformsw = {
};
extern struct domain inetdomain;
-static struct protosw ipe4_protosw =
-{ SOCK_RAW, &inetdomain, IPPROTO_IPV4, PR_ATOMIC|PR_ADDR|PR_LASTHDR,
- ip4_input,
- 0, 0, rip_ctloutput,
- 0, 0, 0, 0,
- &rip_usrreqs
+static struct protosw ipe4_protosw = {
+ .pr_type = SOCK_RAW,
+ .pr_domain = &inetdomain,
+ .pr_protocol = IPPROTO_IPV4,
+ .pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR,
+ .pr_input = ip4_input,
+ .pr_ctloutput = rip_ctloutput,
+ .pr_usrreqs = &rip_usrreqs
};
#ifdef INET6
-static struct ip6protosw ipe6_protosw =
-{ SOCK_RAW, &inetdomain, IPPROTO_IPV6, PR_ATOMIC|PR_ADDR|PR_LASTHDR,
- ip4_input6,
- 0, 0, rip_ctloutput,
- 0, 0, 0, 0,
- &rip_usrreqs
+static struct ip6protosw ipe6_protosw = {
+ .pr_type = SOCK_RAW,
+ .pr_domain = &inetdomain,
+ .pr_protocol = IPPROTO_IPV6,
+ .pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR,
+ .pr_input = ip4_input6,
+ .pr_ctloutput = rip_ctloutput,
+ .pr_usrreqs = &rip_usrreqs
};
#endif
More information about the svn-src-all
mailing list