Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 8 Jun 2011 16:07:44 +0000 (UTC)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r222863 - user/hrs/ipv6/usr.sbin/route6d
Message-ID:  <201106081607.p58G7iS4037870@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Wed Jun  8 16:07:44 2011
New Revision: 222863
URL: http://svn.freebsd.org/changeset/base/222863

Log:
  Revert bogus changes accidentally merged in the previous commit.

Modified:
  user/hrs/ipv6/usr.sbin/route6d/route6d.c

Modified: user/hrs/ipv6/usr.sbin/route6d/route6d.c
==============================================================================
--- user/hrs/ipv6/usr.sbin/route6d/route6d.c	Wed Jun  8 16:06:27 2011	(r222862)
+++ user/hrs/ipv6/usr.sbin/route6d/route6d.c	Wed Jun  8 16:07:44 2011	(r222863)
@@ -106,7 +106,7 @@ static const char _rcsid[] = "$KAME: rou
 
 struct	ifc {			/* Configuration of an interface */
 	char	ifc_name[IFNAMSIZ];		/* if name */
-	TAILQ_ENTRY(ifc) ifc_next;
+	struct	ifc *ifc_next;
 	int	ifc_index;			/* if index */
 	int	ifc_mtu;			/* if mtu */
 	int	ifc_metric;			/* if metric */
@@ -120,7 +120,7 @@ struct	ifc {			/* Configuration of an in
 
 struct	ifac {			/* Adddress associated to an interface */ 
 	struct	ifc *ifa_conf;		/* back pointer */
-	TAILQ_ENTRY(ifac) ifa_next;
+	struct	ifac *ifa_next;
 	struct	in6_addr ifa_addr;	/* address */
 	struct	in6_addr ifa_raddr;	/* remote address, valid in p2p */
 	int	ifa_plen;		/* prefix length */
@@ -134,10 +134,8 @@ struct	iff {
 	struct	iff *iff_next;
 };
 
-TAILQ_HEAD(, ifc) ifc = 
-    TAILQ_HEAD_INITIALIZER(ifc);
-TAILQ_HEAD(, iff) iff_head =
-    TAILQ_HEAD_INITIALIZER(iff_head);
+struct	ifc *ifc;
+struct  iff *iff_head;
 int	nifc;		/* number of valid ifc's */
 struct	ifc **index2ifc;
 unsigned int	nindex2ifc;
@@ -168,7 +166,7 @@ struct	rip6 *ripbuf;	/* packet buffer fo
  */
 
 struct	riprt {
-	TAILQ_ENTRY(riprt) rrt_next;	/* next destination */
+	struct	riprt *rrt_next;	/* next destination */
 	struct	riprt *rrt_same;	/* same destination - future use */
 	struct	netinfo6 rrt_info;	/* network info */
 	struct	in6_addr rrt_gw;	/* gateway */



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