Date: Fri, 30 Jan 2009 15:45:34 -0800 From: Julian Elischer <julian@elischer.org> To: "Bjoern A. Zeeb" <bz@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r187939 - head/sys/netinet6 Message-ID: <4983911E.8030601@elischer.org> In-Reply-To: <200901302340.n0UNeOmX006340@svn.freebsd.org> References: <200901302340.n0UNeOmX006340@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Bjoern A. Zeeb wrote: > Author: bz > Date: Fri Jan 30 23:40:24 2009 > New Revision: 187939 > URL: http://svn.freebsd.org/changeset/base/187939 > > Log: > Remove 4 entirely unsued ip6 variables. > Leave then in struct vinet6 to not break the ABI with kernel modules > but mark them for removal so we can do it in one batch when the time > is right. maybe just rename them to "unused1" etc. > > MFC after: 1 month > > Modified: > head/sys/netinet6/ip6_input.c > head/sys/netinet6/ip6_var.h > head/sys/netinet6/vinet6.h > > Modified: head/sys/netinet6/ip6_input.c > ============================================================================== > --- head/sys/netinet6/ip6_input.c Fri Jan 30 22:23:21 2009 (r187938) > +++ head/sys/netinet6/ip6_input.c Fri Jan 30 23:40:24 2009 (r187939) > @@ -145,11 +145,6 @@ extern int udp6_sendspace; > extern int udp6_recvspace; > > extern struct route_in6 ip6_forward_rt; > - > -int ip6_forward_srcrt; /* XXX */ > -int ip6_sourcecheck; /* XXX */ > -int ip6_sourcecheck_interval; /* XXX */ > -int ip6_ours_check_algorithm; > #endif > > struct pfil_head inet6_pfil_hook; > > Modified: head/sys/netinet6/ip6_var.h > ============================================================================== > --- head/sys/netinet6/ip6_var.h Fri Jan 30 22:23:21 2009 (r187938) > +++ head/sys/netinet6/ip6_var.h Fri Jan 30 23:40:24 2009 (r187939) > @@ -284,7 +284,6 @@ extern struct ip6stat ip6stat; /* statis > extern int ip6_defhlim; /* default hop limit */ > extern int ip6_defmcasthlim; /* default multicast hop limit */ > extern int ip6_forwarding; /* act as router? */ > -extern int ip6_forward_srcrt; /* forward src-routed? */ > extern int ip6_gif_hlim; /* Hop limit for gif encap packet */ > extern int ip6_use_deprecated; /* allow deprecated addr as source */ > extern int ip6_rr_prune; /* router renumbering prefix > @@ -298,8 +297,6 @@ extern struct socket *ip6_mrouter; /* mu > extern int ip6_sendredirects; /* send IP redirects when forwarding? */ > extern int ip6_maxfragpackets; /* Maximum packets in reassembly queue */ > extern int ip6_maxfrags; /* Maximum fragments in reassembly queue */ > -extern int ip6_sourcecheck; /* Verify source interface */ > -extern int ip6_sourcecheck_interval; /* Interval between log messages */ > extern int ip6_accept_rtadv; /* Acts as a host not a router */ > extern int ip6_keepfaith; /* Firewall Aided Internet Translator */ > extern int ip6_log_interval; > > Modified: head/sys/netinet6/vinet6.h > ============================================================================== > --- head/sys/netinet6/vinet6.h Fri Jan 30 22:23:21 2009 (r187938) > +++ head/sys/netinet6/vinet6.h Fri Jan 30 23:40:24 2009 (r187939) > @@ -122,10 +122,10 @@ struct vnet_inet6 { > int _udp6_recvspace; > int _ip6qmaxlen; > int _ip6_prefer_tempaddr; > - int _ip6_forward_srcrt; > - int _ip6_sourcecheck; > - int _ip6_sourcecheck_interval; > - int _ip6_ours_check_algorithm; > + int _ip6_forward_srcrt; /* XXX remove */ > + int _ip6_sourcecheck; /* XXX remove */ > + int _ip6_sourcecheck_interval; /* XXX remove */ > + int _ip6_ours_check_algorithm; /* XXX remove */ > > int _nd6_prune; > int _nd6_delay; > @@ -195,7 +195,6 @@ extern struct vnet_inet6 vnet_inet6_0; > #define V_ip6_defmcasthlim VNET_INET6(ip6_defmcasthlim) > #define V_ip6_desync_factor VNET_INET6(ip6_desync_factor) > #define V_ip6_forward_rt VNET_INET6(ip6_forward_rt) > -#define V_ip6_forward_srcrt VNET_INET6(ip6_forward_srcrt) > #define V_ip6_forwarding VNET_INET6(ip6_forwarding) > #define V_ip6_hdrnestlimit VNET_INET6(ip6_hdrnestlimit) > #define V_ip6_keepfaith VNET_INET6(ip6_keepfaith) > @@ -206,12 +205,9 @@ extern struct vnet_inet6 vnet_inet6_0; > #define V_ip6_mcast_pmtu VNET_INET6(ip6_mcast_pmtu) > #define V_ip6_mrouter_ver VNET_INET6(ip6_mrouter_ver) > #define V_ip6_opts VNET_INET6(ip6_opts) > -#define V_ip6_ours_check_algorithm VNET_INET6(ip6_ours_check_algorithm) > #define V_ip6_prefer_tempaddr VNET_INET6(ip6_prefer_tempaddr) > #define V_ip6_rr_prune VNET_INET6(ip6_rr_prune) > #define V_ip6_sendredirects VNET_INET6(ip6_sendredirects) > -#define V_ip6_sourcecheck VNET_INET6(ip6_sourcecheck) > -#define V_ip6_sourcecheck_interval VNET_INET6(ip6_sourcecheck_interval) > #define V_ip6_temp_preferred_lifetime VNET_INET6(ip6_temp_preferred_lifetime) > #define V_ip6_temp_regen_advance VNET_INET6(ip6_temp_regen_advance) > #define V_ip6_temp_valid_lifetime VNET_INET6(ip6_temp_valid_lifetime)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4983911E.8030601>