# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1276.28.4 -> 1.1276.28.5
#	 net/ipv6/addrconf.c	1.63    -> 1.64   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/09/01	vnuorval@xxxxxxxxxxxxxxxxxxxxxxxxxx	1.1276.28.5
# Allow an IPv6-IPv6 tunnel device to send packets without configuring
# a separate IPv6 address to it.
# --------------------------------------------
#
diff -Nru a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
--- a/net/ipv6/addrconf.c	Mon Sep  1 01:58:45 2003
+++ b/net/ipv6/addrconf.c	Mon Sep  1 01:58:45 2003
@@ -1819,6 +1819,20 @@
 }
 
 
+#if defined(CONFIG_IPV6_TUNNEL) || defined(CONFIG_IPV6_TUNNEL_MODULE)
+static void addrconf_ip6_tnl_config(struct net_device *dev)
+{
+	struct inet6_dev *idev;
+
+	ASSERT_RTNL();
+
+	if ((idev = ipv6_find_idev(dev)) == NULL) {
+		printk(KERN_DEBUG "init ip6-ip6: find_dev failed\n");
+		return;
+	}
+}
+#endif
+
 int addrconf_notify(struct notifier_block *this, unsigned long event, 
 		    void * data)
 {
@@ -1831,7 +1845,11 @@
 		case ARPHRD_SIT:
 			addrconf_sit_config(dev);
 			break;
-
+#if defined(CONFIG_IPV6_TUNNEL) || defined(CONFIG_IPV6_TUNNEL_MODULE)
+		case ARPHRD_TUNNEL6:
+			addrconf_ip6_tnl_config(dev);
+			break;
+#endif
 		case ARPHRD_LOOPBACK:
 			init_loopback(dev);
 			break;