3 files changed, 14 insertions, 10 deletions

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 69b70977f000..eb57502bb264 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -384,6 +384,11 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
         if (hold_time(br) == 0)
                 return;
 
+        /* ignore packets unless we are using this port */
+        if (!(source->state == BR_STATE_LEARNING ||
+              source->state == BR_STATE_FORWARDING))
+                return;
+
         fdb = fdb_find(head, addr);
         if (likely(fdb)) {
                 /* attempt to update an entry for a local interface */
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;
                         }
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 5c18595b7616..6f468fc3357a 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -101,9 +101,8 @@ static int br_handle_local_finish(struct sk_buff *skb)
 {
         struct net_bridge_port *p = rcu_dereference(skb->dev->br_port);
 
-        if (p && p->state != BR_STATE_DISABLED)
+        if (p)
                 br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
-
         return 0;        /* process further */
 }