diff options
author | Kris Katterjohn <kjak@users.sourceforge.net> | 2006-01-05 19:35:42 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-05 19:48:56 -0500 |
commit | 46f25dffbaba48c571d75f5f574f31978287b8d2 (patch) | |
tree | 080e8c4331faf36202bd92174e5e47d0a5d9aa47 /net/bridge | |
parent | e924283bf93989979f27ef4f1228c5925f584a0a (diff) |
[NET]: Change 1500 to ETH_DATA_LEN in some files
These patches add the header linux/if_ether.h and change 1500 to
ETH_DATA_LEN in some files.
Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-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 11321197338e..ba442883e877 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
22 | #include <linux/rtnetlink.h> | 22 | #include <linux/rtnetlink.h> |
23 | #include <linux/if_ether.h> | ||
23 | #include <net/sock.h> | 24 | #include <net/sock.h> |
24 | 25 | ||
25 | #include "br_private.h" | 26 | #include "br_private.h" |
@@ -323,7 +324,7 @@ int br_del_bridge(const char *name) | |||
323 | return ret; | 324 | return ret; |
324 | } | 325 | } |
325 | 326 | ||
326 | /* Mtu of the bridge pseudo-device 1500 or the minimum of the ports */ | 327 | /* MTU of the bridge pseudo-device: ETH_DATA_LEN or the minimum of the ports */ |
327 | int br_min_mtu(const struct net_bridge *br) | 328 | int br_min_mtu(const struct net_bridge *br) |
328 | { | 329 | { |
329 | const struct net_bridge_port *p; | 330 | const struct net_bridge_port *p; |
@@ -332,7 +333,7 @@ int br_min_mtu(const struct net_bridge *br) | |||
332 | ASSERT_RTNL(); | 333 | ASSERT_RTNL(); |
333 | 334 | ||
334 | if (list_empty(&br->port_list)) | 335 | if (list_empty(&br->port_list)) |
335 | mtu = 1500; | 336 | mtu = ETH_DATA_LEN; |
336 | else { | 337 | else { |
337 | list_for_each_entry(p, &br->port_list, list) { | 338 | list_for_each_entry(p, &br->port_list, list) { |
338 | if (!mtu || p->dev->mtu < mtu) | 339 | if (!mtu || p->dev->mtu < mtu) |