Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

bonding: fix 802.3ad support for 5G and 50G speeds

This patch adds [5|50] Gbps enum definition, and fixes
aggregated bandwidth calculation based on above slave links.

Fixes: c9a70d43461d ("net-next: ethtool: Added port speed macros.")
Signed-off-by: Thibaut Collet <thibaut.collet@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Acked-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Thibaut Collet and committed by
David S. Miller
c7c55067 daa6630a

+18
+18
drivers/net/bonding/bond_3ad.c
··· 90 90 AD_LINK_SPEED_100MBPS, 91 91 AD_LINK_SPEED_1000MBPS, 92 92 AD_LINK_SPEED_2500MBPS, 93 + AD_LINK_SPEED_5000MBPS, 93 94 AD_LINK_SPEED_10000MBPS, 94 95 AD_LINK_SPEED_20000MBPS, 95 96 AD_LINK_SPEED_25000MBPS, 96 97 AD_LINK_SPEED_40000MBPS, 98 + AD_LINK_SPEED_50000MBPS, 97 99 AD_LINK_SPEED_56000MBPS, 98 100 AD_LINK_SPEED_100000MBPS, 99 101 }; ··· 261 259 * %AD_LINK_SPEED_100MBPS, 262 260 * %AD_LINK_SPEED_1000MBPS, 263 261 * %AD_LINK_SPEED_2500MBPS, 262 + * %AD_LINK_SPEED_5000MBPS, 264 263 * %AD_LINK_SPEED_10000MBPS 265 264 * %AD_LINK_SPEED_20000MBPS 266 265 * %AD_LINK_SPEED_25000MBPS 267 266 * %AD_LINK_SPEED_40000MBPS 267 + * %AD_LINK_SPEED_50000MBPS 268 268 * %AD_LINK_SPEED_56000MBPS 269 269 * %AD_LINK_SPEED_100000MBPS 270 270 */ ··· 300 296 speed = AD_LINK_SPEED_2500MBPS; 301 297 break; 302 298 299 + case SPEED_5000: 300 + speed = AD_LINK_SPEED_5000MBPS; 301 + break; 302 + 303 303 case SPEED_10000: 304 304 speed = AD_LINK_SPEED_10000MBPS; 305 305 break; ··· 318 310 319 311 case SPEED_40000: 320 312 speed = AD_LINK_SPEED_40000MBPS; 313 + break; 314 + 315 + case SPEED_50000: 316 + speed = AD_LINK_SPEED_50000MBPS; 321 317 break; 322 318 323 319 case SPEED_56000: ··· 719 707 case AD_LINK_SPEED_2500MBPS: 720 708 bandwidth = nports * 2500; 721 709 break; 710 + case AD_LINK_SPEED_5000MBPS: 711 + bandwidth = nports * 5000; 712 + break; 722 713 case AD_LINK_SPEED_10000MBPS: 723 714 bandwidth = nports * 10000; 724 715 break; ··· 733 718 break; 734 719 case AD_LINK_SPEED_40000MBPS: 735 720 bandwidth = nports * 40000; 721 + break; 722 + case AD_LINK_SPEED_50000MBPS: 723 + bandwidth = nports * 50000; 736 724 break; 737 725 case AD_LINK_SPEED_56000MBPS: 738 726 bandwidth = nports * 56000;