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

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>

1 files changed, 8 insertions, 8 deletions

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 749f0e8f541d..9272f12f664c 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -33,17 +33,17 @@
  */
 static int port_cost(struct net_device *dev)
 {
-        if (dev->ethtool_ops->get_settings) {
-                struct ethtool_cmd ecmd = { ETHTOOL_GSET };
-                int err = dev->ethtool_ops->get_settings(dev, &ecmd);
-                if (!err) {
+        if (dev->ethtool_ops && dev->ethtool_ops->get_settings) {
+                struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET, };
+
+                if (!dev->ethtool_ops->get_settings(dev, &ecmd)) {
                         switch(ecmd.speed) {
-                        case SPEED_100:
-                                return 19;
-                        case SPEED_1000:
-                                return 4;
                         case SPEED_10000:
                                 return 2;
+                        case SPEED_1000:
+                                return 4;
+                        case SPEED_100:
+                                return 19;
                         case SPEED_10:
                                 return 100;
                         }