git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
bridge
/
br_stp_if.c
diff --git
a/net/bridge/br_stp_if.c
b/net/bridge/br_stp_if.c
index
9e1d296
..
d294224
100644
(file)
--- a/
net/bridge/br_stp_if.c
+++ b/
net/bridge/br_stp_if.c
@@
-15,6
+15,8
@@
#include <linux/kernel.h>
#include <linux/smp_lock.h>
#include <linux/kernel.h>
#include <linux/smp_lock.h>
+#include <linux/etherdevice.h>
+#include <linux/rtnetlink.h>
#include "br_private.h"
#include "br_private_stp.h"
#include "br_private.h"
#include "br_private_stp.h"
@@
-38,8
+40,6
@@
void br_init_port(struct net_bridge_port *p)
p->state = BR_STATE_BLOCKING;
p->topology_change_ack = 0;
p->config_pending = 0;
p->state = BR_STATE_BLOCKING;
p->topology_change_ack = 0;
p->config_pending = 0;
-
- br_stp_port_timer_init(p);
}
/* called under bridge lock */
}
/* called under bridge lock */
@@
-49,10
+49,12
@@
void br_stp_enable_bridge(struct net_bridge *br)
spin_lock_bh(&br->lock);
mod_timer(&br->hello_timer, jiffies + br->hello_time);
spin_lock_bh(&br->lock);
mod_timer(&br->hello_timer, jiffies + br->hello_time);
+ mod_timer(&br->gc_timer, jiffies + HZ/10);
+
br_config_bpdu_generation(br);
list_for_each_entry(p, &br->port_list, list) {
br_config_bpdu_generation(br);
list_for_each_entry(p, &br->port_list, list) {
- if (
p->dev->flags & IFF_UP
)
+ if (
(p->dev->flags & IFF_UP) && netif_carrier_ok(p->dev)
)
br_stp_enable_port(p);
}
br_stp_enable_port(p);
}
@@
-64,7
+66,7
@@
void br_stp_disable_bridge(struct net_bridge *br)
{
struct net_bridge_port *p;
{
struct net_bridge_port *p;
- spin_lock(&br->lock);
+ spin_lock
_bh
(&br->lock);
list_for_each_entry(p, &br->port_list, list) {
if (p->state != BR_STATE_DISABLED)
br_stp_disable_port(p);
list_for_each_entry(p, &br->port_list, list) {
if (p->state != BR_STATE_DISABLED)
br_stp_disable_port(p);
@@
-73,17
+75,19
@@
void br_stp_disable_bridge(struct net_bridge *br)
br->topology_change = 0;
br->topology_change_detected = 0;
br->topology_change = 0;
br->topology_change_detected = 0;
- spin_unlock(&br->lock);
+ spin_unlock
_bh
(&br->lock);
del_timer_sync(&br->hello_timer);
del_timer_sync(&br->topology_change_timer);
del_timer_sync(&br->tcn_timer);
del_timer_sync(&br->hello_timer);
del_timer_sync(&br->topology_change_timer);
del_timer_sync(&br->tcn_timer);
+ del_timer_sync(&br->gc_timer);
}
/* called under bridge lock */
void br_stp_enable_port(struct net_bridge_port *p)
{
br_init_port(p);
}
/* called under bridge lock */
void br_stp_enable_port(struct net_bridge_port *p)
{
br_init_port(p);
+ br_ifinfo_notify(RTM_NEWLINK, p);
br_port_state_selection(p->br);
}
br_port_state_selection(p->br);
}
@@
-97,6
+101,8
@@
void br_stp_disable_port(struct net_bridge_port *p)
printk(KERN_INFO "%s: port %i(%s) entering %s state\n",
br->dev->name, p->port_no, p->dev->name, "disabled");
printk(KERN_INFO "%s: port %i(%s) entering %s state\n",
br->dev->name, p->port_no, p->dev->name, "disabled");
+ br_ifinfo_notify(RTM_DELLINK, p);
+
wasroot = br_is_root_bridge(br);
br_become_designated_port(p);
p->state = BR_STATE_DISABLED;
wasroot = br_is_root_bridge(br);
br_become_designated_port(p);
p->state = BR_STATE_DISABLED;
@@
-107,6
+113,8
@@
void br_stp_disable_port(struct net_bridge_port *p)
del_timer(&p->forward_delay_timer);
del_timer(&p->hold_timer);
del_timer(&p->forward_delay_timer);
del_timer(&p->hold_timer);
+ br_fdb_delete_by_port(br, p, 0);
+
br_configuration_update(br);
br_port_state_selection(br);
br_configuration_update(br);
br_port_state_selection(br);
@@
-116,8
+124,7
@@
void br_stp_disable_port(struct net_bridge_port *p)
}
/* called under bridge lock */
}
/* called under bridge lock */
-static void br_stp_change_bridge_id(struct net_bridge *br,
- const unsigned char *addr)
+void br_stp_change_bridge_id(struct net_bridge *br, const unsigned char *addr)
{
unsigned char oldaddr[6];
struct net_bridge_port *p;
{
unsigned char oldaddr[6];
struct net_bridge_port *p;
@@
-130,10
+137,10
@@
static void br_stp_change_bridge_id(struct net_bridge *br,
memcpy(br->dev->dev_addr, addr, ETH_ALEN);
list_for_each_entry(p, &br->port_list, list) {
memcpy(br->dev->dev_addr, addr, ETH_ALEN);
list_for_each_entry(p, &br->port_list, list) {
- if (!
memcmp(p->designated_bridge.addr, oldaddr, ETH_ALEN
))
+ if (!
compare_ether_addr(p->designated_bridge.addr, oldaddr
))
memcpy(p->designated_bridge.addr, addr, ETH_ALEN);
memcpy(p->designated_bridge.addr, addr, ETH_ALEN);
- if (!
memcmp(p->designated_root.addr, oldaddr, ETH_ALEN
))
+ if (!
compare_ether_addr(p->designated_root.addr, oldaddr
))
memcpy(p->designated_root.addr, addr, ETH_ALEN);
}
memcpy(p->designated_root.addr, addr, ETH_ALEN);
}
@@
-159,7
+166,7
@@
void br_stp_recalculate_bridge_id(struct net_bridge *br)
}
}
- if (
memcmp(br->bridge_id.addr, addr, ETH_ALEN
))
+ if (
compare_ether_addr(br->bridge_id.addr, addr
))
br_stp_change_bridge_id(br, addr);
}
br_stp_change_bridge_id(br, addr);
}