patch-2.4.0-test10 linux/net/ipv6/sit.c

• Lines: 28
• Date: Mon Oct 30 14:34:13 2000
• Orig file: v2.4.0-test9/linux/net/ipv6/sit.c
• Orig date: Mon Aug 28 12:03:11 2000

diff -u --recursive --new-file v2.4.0-test9/linux/net/ipv6/sit.c linux/net/ipv6/sit.c
@@ -6,7 +6,7 @@
  *	Pedro Roque		<roque@di.fc.ul.pt>	
  *	Alexey Kuznetsov	<kuznet@ms2.inr.ac.ru>
  *
- *	$Id: sit.c,v 1.43 2000/08/25 02:15:47 davem Exp $
+ *	$Id: sit.c,v 1.45 2000/10/28 17:19:25 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -188,7 +188,7 @@
 		}
 		if (i==100)
 			goto failed;
-		memcpy(parms->name, dev->name, IFNAMSIZ);
+		memcpy(nt->parms.name, dev->name, IFNAMSIZ);
 	}
 	if (register_netdevice(dev) < 0)
 		goto failed;
@@ -829,7 +829,9 @@
 #ifdef MODULE
 	register_netdev(&ipip6_fb_tunnel_dev);
 #else
+	rtnl_lock();
 	register_netdevice(&ipip6_fb_tunnel_dev);
+	rtnl_unlock();
 #endif
 	inet_add_protocol(&sit_protocol);
 	return 0;