History

bonding: fix 802.3ad support for 14G speed

This patch adds 14 Gbps enum definition, and fixes aggregated bandwidth calculation based on above slave links.

Nicolas Dichtel committed 9 years ago

Commit 3fcd64c1 parent c7c55061 file · +9 −0Browse files

Unified · Split

drivers/net/bonding/bond_3ad.c+9−0
@@ -92,6 +92,7 @@ enum ad_link_speed_type { · 91 unmodified lines
92 AD_LINK_SPEED_2500MBPS,92 AD_LINK_SPEED_2500MBPS,
93 AD_LINK_SPEED_5000MBPS,93 AD_LINK_SPEED_5000MBPS,
94 AD_LINK_SPEED_10000MBPS,94 AD_LINK_SPEED_10000MBPS,
95 AD_LINK_SPEED_14000MBPS,
95 AD_LINK_SPEED_20000MBPS,96 AD_LINK_SPEED_20000MBPS,
96 AD_LINK_SPEED_25000MBPS,97 AD_LINK_SPEED_25000MBPS,
97 AD_LINK_SPEED_40000MBPS,98 AD_LINK_SPEED_40000MBPS,
@@ -263,6 +264,7 @@ static inline int __check_agg_selection_timer(struct port *port) · 165 unmodified lines
263 * %AD_LINK_SPEED_2500MBPS,264 * %AD_LINK_SPEED_2500MBPS,
264 * %AD_LINK_SPEED_5000MBPS,265 * %AD_LINK_SPEED_5000MBPS,
265 * %AD_LINK_SPEED_10000MBPS266 * %AD_LINK_SPEED_10000MBPS
267 * %AD_LINK_SPEED_14000MBPS,
266 * %AD_LINK_SPEED_20000MBPS268 * %AD_LINK_SPEED_20000MBPS
267 * %AD_LINK_SPEED_25000MBPS269 * %AD_LINK_SPEED_25000MBPS
268 * %AD_LINK_SPEED_40000MBPS270 * %AD_LINK_SPEED_40000MBPS
@@ -308,6 +310,10 @@ static u16 __get_link_speed(struct port *port) · 39 unmodified lines
308 speed = AD_LINK_SPEED_10000MBPS;310 speed = AD_LINK_SPEED_10000MBPS;
309 break;311 break;
310 312
313 case SPEED_14000:
314 speed = AD_LINK_SPEED_14000MBPS;
315 break;
316
311 case SPEED_20000:317 case SPEED_20000:
312 speed = AD_LINK_SPEED_20000MBPS;318 speed = AD_LINK_SPEED_20000MBPS;
313 break;319 break;
@@ -725,6 +731,9 @@ static u32 __get_agg_bandwidth(struct aggregator *aggregator) · 411 unmodified lines
725 case AD_LINK_SPEED_10000MBPS:731 case AD_LINK_SPEED_10000MBPS:
726 bandwidth = nports * 10000;732 bandwidth = nports * 10000;
727 break;733 break;
734 case AD_LINK_SPEED_14000MBPS:
735 bandwidth = nports * 14000;
736 break;
728 case AD_LINK_SPEED_20000MBPS:737 case AD_LINK_SPEED_20000MBPS:
729 bandwidth = nports * 20000;738 bandwidth = nports * 20000;
730 break;739 break;