patch-2.3.99-pre7 linux/net/bridge/br_if.c

• Lines: 29
• Date: Mon May 8 22:21:58 2000
• Orig file: v2.3.99-pre6/linux/net/bridge/br_if.c
• Orig date: Sat Feb 26 22:32:08 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/net/bridge/br_if.c linux/net/bridge/br_if.c
@@ -5,7 +5,7 @@
  *	Authors:
  *	Lennert Buytenhek		<buytenh@gnu.org>
  *
- *	$Id: br_if.c,v 1.2 2000/02/21 15:51:34 davem Exp $
+ *	$Id: br_if.c,v 1.3 2000/05/05 02:17:17 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License
@@ -74,7 +74,7 @@
 
 	b = &bridge_list;
 	while ((br = *b) != NULL) {
-		if (!strncmp(br->name, name, IFNAMSIZ))
+		if (!strncmp(br->dev.name, name, IFNAMSIZ))
 			return b;
 
 		b = &(br->next);
@@ -102,9 +102,8 @@
 	memset(br, 0, sizeof(*br));
 	dev = &br->dev;
 
-	strncpy(br->name, name, IFNAMSIZ);
+	strncpy(dev->name, name, IFNAMSIZ);
 	dev->priv = br;
-	dev->name = br->name;
 	ether_setup(dev);
 	br_dev_setup(dev);