lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[BRIDGE]: Fix OOPS when bridging device without ethtool.

Browse Source 
Bridge code calls ethtool to get speed. The conversion to using
only ethtool_ops broke the case of devices without ethtool_ops.
This is a new regression in 2.6.23.

Rearranged the switch to a logical order, and use gcc initializer.

Ps: speed should have been part of the network device structure from
    the start rather than burying it in ethtool.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Acked-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger
2007-08-30 22:16:22 -07:00
committed by David S. Miller
parent df1c0b8468
commit b4a488d182
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
net/bridge/br_if.c
View File

@@ -33,17 +33,17 @@
*/ */
static int port_cost(struct net_device *dev) static int port_cost(struct net_device *dev)
{ {
if (dev->ethtool_ops->get_settings) { if (dev->ethtool_ops && dev->ethtool_ops->get_settings) {
struct ethtool_cmd ecmd = { ETHTOOL_GSET }; struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET, };
int err = dev->ethtool_ops->get_settings(dev, &ecmd);
if (!err) { if (!dev->ethtool_ops->get_settings(dev, &ecmd)) {
switch(ecmd.speed) { switch(ecmd.speed) {
case SPEED_100:
return 19;
case SPEED_1000:
return 4;
case SPEED_10000: case SPEED_10000:
return 2; return 2;
case SPEED_1000:
return 4;
case SPEED_100:
return 19;
case SPEED_10: case SPEED_10:
return 100; return 100;
} }