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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
net
/
bridge
/
br_if.c
diff --git
a/net/bridge/br_if.c
b/net/bridge/br_if.c
index
43d0373
..
092d451
100644
(file)
--- a/
net/bridge/br_if.c
+++ b/
net/bridge/br_if.c
@@
-149,7
+149,7
@@
static struct net_device *new_bridge_dev(const char *name)
br->lock = SPIN_LOCK_UNLOCKED;
INIT_LIST_HEAD(&br->port_list);
br->lock = SPIN_LOCK_UNLOCKED;
INIT_LIST_HEAD(&br->port_list);
- br->hash_lock =
SPIN
_LOCK_UNLOCKED;
+ br->hash_lock =
RW
_LOCK_UNLOCKED;
br->bridge_id.prio[0] = 0x80;
br->bridge_id.prio[1] = 0x00;
br->bridge_id.prio[0] = 0x80;
br->bridge_id.prio[1] = 0x00;
@@
-295,7
+295,6
@@
int br_del_bridge(const char *name)
return ret;
}
return ret;
}
-/* Mtu of the bridge pseudo-device 1500 or the minimum of the ports */
int br_min_mtu(const struct net_bridge *br)
{
const struct net_bridge_port *p;
int br_min_mtu(const struct net_bridge *br)
{
const struct net_bridge_port *p;
@@
-344,12
+343,11
@@
int br_add_if(struct net_bridge *br, struct net_device *dev)
spin_lock_bh(&br->lock);
br_stp_recalculate_bridge_id(br);
spin_lock_bh(&br->lock);
br_stp_recalculate_bridge_id(br);
- if ((br->dev->flags & IFF_UP)
- && (dev->flags & IFF_UP) && netif_carrier_ok(dev))
+ if ((br->dev->flags & IFF_UP) && (dev->flags & IFF_UP))
br_stp_enable_port(p);
spin_unlock_bh(&br->lock);
br_stp_enable_port(p);
spin_unlock_bh(&br->lock);
-
dev_set_mtu(br->dev, br_min_mtu(br)
);
+
br->dev->mtu = br_min_mtu(br
);
}
return err;
}
return err;