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

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

diff -u --recursive --new-file v2.3.99-pre6/linux/net/bridge/br_stp.c linux/net/bridge/br_stp.c
@@ -5,7 +5,7 @@
  *	Authors:
  *	Lennert Buytenhek		<buytenh@gnu.org>
  *
- *	$Id: br_stp.c,v 1.2 2000/02/21 15:51:34 davem Exp $
+ *	$Id: br_stp.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
@@ -292,7 +292,7 @@
 /* called under bridge lock */
 void br_topology_change_detection(struct net_bridge *br)
 {
-	printk(KERN_INFO "%s: topology change detected, ", br->name);
+	printk(KERN_INFO "%s: topology change detected, ", br->dev.name);
 
 	if (br_is_root_bridge(br)) {
 		printk("propagating\n");
@@ -357,7 +357,7 @@
 			br_topology_change_detection(p->br);
 
 		printk(KERN_INFO "%s: port %i(%s) entering %s state\n",
-		       p->br->name, p->port_no, p->dev->name, "blocking");
+		       p->br->dev.name, p->port_no, p->dev->name, "blocking");
 
 		p->state = BR_STATE_BLOCKING;
 		br_timer_clear(&p->forward_delay_timer);
@@ -369,7 +369,7 @@
 {
 	if (p->state == BR_STATE_BLOCKING) {
 		printk(KERN_INFO "%s: port %i(%s) entering %s state\n",
-		       p->br->name, p->port_no, p->dev->name, "listening");
+		       p->br->dev.name, p->port_no, p->dev->name, "listening");
 
 		p->state = BR_STATE_LISTENING;
 		br_timer_set(&p->forward_delay_timer, jiffies);
@@ -456,7 +456,7 @@
 	if (p->state != BR_STATE_DISABLED &&
 	    br_is_designated_port(p)) {
 		printk(KERN_INFO "%s: received tcn bpdu on port %i(%s)\n",
-		       p->br->name, p->port_no, p->dev->name);
+		       p->br->dev.name, p->port_no, p->dev->name);
 
 		br_topology_change_detection(p->br);
 		br_topology_change_acknowledge(p);