diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 22:22:50 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 22:22:50 -0500 |
| commit | 52cab57873c25d3c8324ee3e4d463db6e8e73fd7 (patch) | |
| tree | 826cb36827afa363944e6478d19512e669446c64 /net/bridge/br_if.c | |
| parent | 0a75c23a009ff65f651532cecc16675d05f4de37 (diff) | |
| parent | 46f25dffbaba48c571d75f5f574f31978287b8d2 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'net/bridge/br_if.c')
| -rw-r--r-- | net/bridge/br_if.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 11321197338..ba442883e87 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -20,6 +20,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/rtnetlink.h> +#include <linux/if_ether.h> #include <net/sock.h> #include "br_private.h" @@ -323,7 +324,7 @@ int br_del_bridge(const char *name) return ret; } -/* Mtu of the bridge pseudo-device 1500 or the minimum of the ports */ +/* MTU of the bridge pseudo-device: ETH_DATA_LEN or the minimum of the ports */ int br_min_mtu(const struct net_bridge *br) { const struct net_bridge_port *p; @@ -332,7 +333,7 @@ int br_min_mtu(const struct net_bridge *br) ASSERT_RTNL(); if (list_empty(&br->port_list)) - mtu = 1500; + mtu = ETH_DATA_LEN; else { list_for_each_entry(p, &br->port_list, list) { if (!mtu || p->dev->mtu < mtu) |