Date: Fri, 7 Sep 2007 11:59:46 GMT From: Ana Kukec <anchie@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 126152 for review Message-ID: <200709071159.l87BxkZd096793@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=126152 Change 126152 by anchie@anchie_malimis on 2007/09/07 11:59:22 Changed declarations of some netinet6 variables. Affected files ... .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#18 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.c#21 edit .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#12 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#16 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet6/in6_proto.c#18 (text+ko) ==== @@ -519,10 +519,6 @@ auto_flowlabel, CTLFLAG_RW, ip6_auto_flowlabel, 0, ""); SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_DEFMCASTHLIM, defmcasthlim, CTLFLAG_RW, ip6_defmcasthlim, 0, ""); -/* -SYSCTL_V_INT(V_NET, vnet_gif, _net_inet6_ip6, IPV6CTL_GIF_HLIM, - gifhlim, CTLFLAG_RW, ip6_gif_hlim, 0, ""); -*/ SYSCTL_STRING(_net_inet6_ip6, IPV6CTL_KAME_VERSION, kame_version, CTLFLAG_RD, __KAME_VERSION, 0, ""); SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_USE_DEPRECATED, ==== //depot/projects/vimage/src/sys/netinet6/nd6.c#21 (text+ko) ==== @@ -109,6 +109,9 @@ struct nd_prhead nd_prefix; int nd6_recalc_reachtm_interval; + +extern int dad_ignore_ns; /* ignore NS in DAD - specwise incorrect*/ +extern int dad_maxtry; /* max # of *tries* to transmit DAD packet */ #endif /* !VIMAGE */ static struct sockaddr_in6 all1_sa; @@ -154,7 +157,9 @@ V_nd6_recalc_reachtm_interval = ND6_RECALC_REACHTM_INTERVAL; +#ifdef INET6 V_dad_ignore_ns = 0; /* ignore NS in DAD - specwise incorrect*/ +#endif V_dad_maxtry = 15; /* max # of *tries* to transmit DAD packet */ V_ip6_use_tempaddr = 0; ==== //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#12 (text+ko) ==== @@ -84,8 +84,8 @@ static void nd6_dad_na_input __P((struct ifaddr *)); #ifndef VIMAGE -static int dad_ignore_ns; /* ignore NS in DAD - specwise incorrect*/ -static int dad_maxtry; /* max # of *tries* to transmit DAD packet */ +int dad_ignore_ns; /* ignore NS in DAD - specwise incorrect*/ +int dad_maxtry; /* max # of *tries* to transmit DAD packet */ #endif /* !VIMAGE */ /* ==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#16 (text+ko) ==== @@ -198,6 +198,9 @@ int ip6_ipsec_ecn; /* ECN ignore(-1)/forbidden(0)/allowed(1) */ int ip6_esp_randpad; #endif +#endif /* !VIMAGE */ + +#ifdef INET6 SYSCTL_DECL(_net_inet6_ipsec6); /* net.inet6.ipsec6 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200709071159.l87BxkZd096793>