net: bridge: assign path_cost for 2.5G and 5G link speed

As 2.5G, 5G ethernet ports are more common and affordable,
these ports are being used in LAN bridge devices.
STP port_cost() is missing path_cost assignment for these link speeds,
causes highest cost 100 being used.
This result in lower speed port being picked
when there is loop between 5G and 1G ports.

Original path_cost: 10G=2, 1G=4, 100m=19, 10m=100
Adjusted path_cost: 10G=2, 5G=3, 2.5G=4, 1G=5, 100m=19, 10m=100
                    speed greater than 10G = 1

Signed-off-by: Steven Hsieh <steven.hsieh@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index efbd93e92ce287dd69280f099ea235fb1411148d..228fd5b20f109e4190f6e0e169c77683c8d2ec61 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -40,12 +40,21 @@ static int port_cost(struct net_device *dev)
                switch (ecmd.base.speed) {
                case SPEED_10000:
                        return 2;
-               case SPEED_1000:
+               case SPEED_5000:
+                       return 3;
+               case SPEED_2500:
                        return 4;
+               case SPEED_1000:
+                       return 5;
                case SPEED_100:
                        return 19;
                case SPEED_10:
                        return 100;
+               case SPEED_UNKNOWN:
+                       return 100;
+               default:
+                       if (ecmd.base.speed > SPEED_10000)
+                               return 1;
                }
        }