svn commit: r196546 - in stable/7/sys: . contrib/pf netinet6

[Bjoern A. Zeeb]

Author: bz
Date: Tue Aug 25 16:56:33 2009
New Revision: 196546
URL: http://svn.freebsd.org/changeset/base/196546

Log:
  MFC r187939:
  
    Remove 4 entirely unsued ip6 variables.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/netinet6/ip6_input.c
  stable/7/sys/netinet6/ip6_var.h

Modified: stable/7/sys/netinet6/ip6_input.c
==============================================================================
--- stable/7/sys/netinet6/ip6_input.c	Tue Aug 25 15:58:07 2009	(r196545)
+++ stable/7/sys/netinet6/ip6_input.c	Tue Aug 25 16:56:33 2009	(r196546)
@@ -120,12 +120,6 @@ struct in6_ifaddr *in6_ifaddr;
 
 extern struct callout in6_tmpaddrtimer_ch;
 
-int ip6_forward_srcrt;			/* XXX */
-int ip6_sourcecheck;			/* XXX */
-int ip6_sourcecheck_interval;		/* XXX */
-
-int ip6_ours_check_algorithm;
-
 struct pfil_head inet6_pfil_hook;
 
 struct ip6stat ip6stat;

Modified: stable/7/sys/netinet6/ip6_var.h
==============================================================================
--- stable/7/sys/netinet6/ip6_var.h	Tue Aug 25 15:58:07 2009	(r196545)
+++ stable/7/sys/netinet6/ip6_var.h	Tue Aug 25 16:56:33 2009	(r196546)
@@ -282,7 +282,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
@@ -294,8 +293,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;