svn commit: r238233 - stable/9/sys/netinet6

[Bjoern A. Zeeb]

Author: bz
Date: Sun Jul  8 11:42:21 2012
New Revision: 238233
URL: http://svn.freebsd.org/changeset/base/238233

Log:
  MFC r235956:
  
     Hide the ip6aux functions.  The only one referenced outside ip6_input.c
     is not compiled in yet (__notyet__) in route6.c (r235954, r238231).
     We do have accessor functions that should be used.
  
  Approved by:	re

Modified:
  stable/9/sys/netinet6/ip6_input.c
  stable/9/sys/netinet6/ip6_var.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet6/ip6_input.c
==============================================================================
--- stable/9/sys/netinet6/ip6_input.c	Sun Jul  8 11:33:49 2012	(r238232)
+++ stable/9/sys/netinet6/ip6_input.c	Sun Jul  8 11:42:21 2012	(r238233)
@@ -146,6 +146,9 @@ RW_SYSINIT(in6_ifaddr_lock, &in6_ifaddr_
 
 static void ip6_init2(void *);
 static struct ip6aux *ip6_setdstifaddr(struct mbuf *, struct in6_ifaddr *);
+static struct ip6aux *ip6_addaux(struct mbuf *);
+static struct ip6aux *ip6_findaux(struct mbuf *m);
+static void ip6_delaux (struct mbuf *);
 static int ip6_hopopts_input(u_int32_t *, u_int32_t *, struct mbuf **, int *);
 #ifdef PULLDOWN_TEST
 static struct mbuf *ip6_pullexthdr(struct mbuf *, size_t, int);
@@ -1814,7 +1817,7 @@ ip6_lasthdr(struct mbuf *m, int off, int
 	}
 }
 
-struct ip6aux *
+static struct ip6aux *
 ip6_addaux(struct mbuf *m)
 {
 	struct m_tag *mtag;
@@ -1831,7 +1834,7 @@ ip6_addaux(struct mbuf *m)
 	return mtag ? (struct ip6aux *)(mtag + 1) : NULL;
 }
 
-struct ip6aux *
+static struct ip6aux *
 ip6_findaux(struct mbuf *m)
 {
 	struct m_tag *mtag;
@@ -1840,7 +1843,7 @@ ip6_findaux(struct mbuf *m)
 	return mtag ? (struct ip6aux *)(mtag + 1) : NULL;
 }
 
-void
+static void
 ip6_delaux(struct mbuf *m)
 {
 	struct m_tag *mtag;

Modified: stable/9/sys/netinet6/ip6_var.h
==============================================================================
--- stable/9/sys/netinet6/ip6_var.h	Sun Jul  8 11:33:49 2012	(r238232)
+++ stable/9/sys/netinet6/ip6_var.h	Sun Jul  8 11:42:21 2012	(r238233)
@@ -388,9 +388,9 @@ char *	ip6_get_prevhdr __P((struct mbuf 
 int	ip6_nexthdr __P((struct mbuf *, int, int, int *));
 int	ip6_lasthdr __P((struct mbuf *, int, int, int *));
 
-struct ip6aux *ip6_addaux __P((struct mbuf *));
+#ifdef __notyet__
 struct ip6aux *ip6_findaux __P((struct mbuf *));
-void	ip6_delaux __P((struct mbuf *));
+#endif
 
 extern int	(*ip6_mforward)(struct ip6_hdr *, struct ifnet *,
     struct mbuf *);