Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 8 Feb 2012 22:05:26 +0000 (UTC)
From:      Sergey Kandaurov <pluknet@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r231229 - head/sys/net
Message-ID:  <201202082205.q18M5Q6f066916@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pluknet
Date: Wed Feb  8 22:05:26 2012
New Revision: 231229
URL: http://svn.freebsd.org/changeset/base/231229

Log:
  g/c last bit of old ipv6 prefix management.
  
  Reviewed by:	bz
  Obtained from:	NetBSD, net/if.h, rev 1.80

Modified:
  head/sys/net/if.c
  head/sys/net/if_var.h

Modified: head/sys/net/if.c
==============================================================================
--- head/sys/net/if.c	Wed Feb  8 21:40:54 2012	(r231228)
+++ head/sys/net/if.c	Wed Feb  8 22:05:26 2012	(r231229)
@@ -456,7 +456,6 @@ if_alloc(u_char type)
 	ifp->if_afdata_initialized = 0;
 	IF_AFDATA_LOCK_INIT(ifp);
 	TAILQ_INIT(&ifp->if_addrhead);
-	TAILQ_INIT(&ifp->if_prefixhead);
 	TAILQ_INIT(&ifp->if_multiaddrs);
 	TAILQ_INIT(&ifp->if_groups);
 #ifdef MAC

Modified: head/sys/net/if_var.h
==============================================================================
--- head/sys/net/if_var.h	Wed Feb  8 21:40:54 2012	(r231228)
+++ head/sys/net/if_var.h	Wed Feb  8 22:05:26 2012	(r231229)
@@ -96,7 +96,6 @@ struct	vnet;
 
 TAILQ_HEAD(ifnethead, ifnet);	/* we use TAILQs so that the order of */
 TAILQ_HEAD(ifaddrhead, ifaddr);	/* instantiation is preserved in the list */
-TAILQ_HEAD(ifprefixhead, ifprefix);
 TAILQ_HEAD(ifmultihead, ifmultiaddr);
 TAILQ_HEAD(ifgrouphead, ifg_group);
 
@@ -184,7 +183,7 @@ struct ifnet {
 	struct	label *if_label;	/* interface MAC label */
 
 	/* these are only used by IPv6 */
-	struct	ifprefixhead if_prefixhead; /* list of prefixes per if */
+	void	*if_unused[2];
 	void	*if_afdata[AF_MAX];
 	int	if_afdata_initialized;
 	struct	rwlock if_afdata_lock;
@@ -762,20 +761,6 @@ void	ifa_ref(struct ifaddr *ifa);
 #endif
 
 /*
- * The prefix structure contains information about one prefix
- * of an interface.  They are maintained by the different address families,
- * are allocated and attached when a prefix or an address is set,
- * and are linked together so all prefixes for an interface can be located.
- */
-struct ifprefix {
-	struct	sockaddr *ifpr_prefix;	/* prefix of interface */
-	struct	ifnet *ifpr_ifp;	/* back-pointer to interface */
-	TAILQ_ENTRY(ifprefix) ifpr_list; /* queue macro glue */
-	u_char	ifpr_plen;		/* prefix length in bits */
-	u_char	ifpr_type;		/* protocol dependent prefix type */
-};
-
-/*
  * Multicast address structure.  This is analogous to the ifaddr
  * structure except that it keeps track of multicast addresses.
  */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202082205.q18M5Q6f066916>