Commit cb360039 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by Xibo.Wang
Browse files

bonding: 3ad: add support for 200G speed 

mainline inclusion
from v5.12-rc1
commit  ab73447c
category: task
bugzilla: https://gitee.com/openeuler/kernel/issues/I5Y4KC


CVE: NA

-------------------------------------------

In order to be able to use 3ad mode with 200G devices we need to extend
the supported speeds.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSun Shouxin <sunshouxin@chinatelecom.cn>
Signed-off-by: default avatarXibo.Wang <wangxb12@chinatelecom.cn>
parent 33e7f3b4

drivers/net/bonding/bond_3ad.c

+9 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ enum ad_link_speed_type { 
	AD_LINK_SPEED_50000MBPS,

	AD_LINK_SPEED_56000MBPS,

	AD_LINK_SPEED_100000MBPS,

	AD_LINK_SPEED_200000MBPS,

};



/* compare MAC addresses */
@@ -245,6 +246,7 @@ static inline int __check_agg_selection_timer(struct port *port) 
 *     %AD_LINK_SPEED_50000MBPS

 *     %AD_LINK_SPEED_56000MBPS

 *     %AD_LINK_SPEED_100000MBPS

 *     %AD_LINK_SPEED_200000MBPS

 */

static u16 __get_link_speed(struct port *port)

{
@@ -312,6 +314,10 @@ static u16 __get_link_speed(struct port *port) 
			speed = AD_LINK_SPEED_100000MBPS;

			break;



		case SPEED_200000:

			speed = AD_LINK_SPEED_200000MBPS;

			break;



		default:

			/* unknown speed value from ethtool. shouldn't happen */

			if (slave->speed != SPEED_UNKNOWN)
@@ -733,6 +739,9 @@ static u32 __get_agg_bandwidth(struct aggregator *aggregator) 
		case AD_LINK_SPEED_100000MBPS:

			bandwidth = nports * 100000;

			break;

		case AD_LINK_SPEED_200000MBPS:

			bandwidth = nports * 200000;

			break;

		default:

			bandwidth = 0; /* to silence the compiler */

		}