bonding: add 802.3ad support for 100G speeds
authorJiri Pirko <jiri@mellanox.com>
Thu, 3 Dec 2015 11:12:05 +0000 (12:12 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Dec 2015 16:49:24 +0000 (11:49 -0500)
Similar to other speeds, add 100G to bonding 802.3ad code.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_3ad.c

index 940e2ebbdea81ef459cffa1128361816f7d309f1..4cbb8b27a891237a2541c6fcf506ae2e0db08686 100644 (file)
@@ -93,7 +93,8 @@ enum ad_link_speed_type {
        AD_LINK_SPEED_10000MBPS,
        AD_LINK_SPEED_20000MBPS,
        AD_LINK_SPEED_40000MBPS,
-       AD_LINK_SPEED_56000MBPS
+       AD_LINK_SPEED_56000MBPS,
+       AD_LINK_SPEED_100000MBPS,
 };
 
 /* compare MAC addresses */
@@ -258,6 +259,7 @@ static inline int __check_agg_selection_timer(struct port *port)
  *     %AD_LINK_SPEED_20000MBPS
  *     %AD_LINK_SPEED_40000MBPS
  *     %AD_LINK_SPEED_56000MBPS
+ *     %AD_LINK_SPEED_100000MBPS
  */
 static u16 __get_link_speed(struct port *port)
 {
@@ -305,6 +307,10 @@ static u16 __get_link_speed(struct port *port)
                        speed = AD_LINK_SPEED_56000MBPS;
                        break;
 
+               case SPEED_100000:
+                       speed = AD_LINK_SPEED_100000MBPS;
+                       break;
+
                default:
                        /* unknown speed value from ethtool. shouldn't happen */
                        speed = 0;
@@ -681,6 +687,9 @@ static u32 __get_agg_bandwidth(struct aggregator *aggregator)
                case AD_LINK_SPEED_56000MBPS:
                        bandwidth = aggregator->num_of_ports * 56000;
                        break;
+               case AD_LINK_SPEED_100000MBPS:
+                       bandwidth = aggregator->num_of_ports * 100000;
+                       break;
                default:
                        bandwidth = 0; /* to silence the compiler */
                }