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
9292 AD_LINK_SPEED_2500MBPS,
9393 AD_LINK_SPEED_5000MBPS,
9494 AD_LINK_SPEED_10000MBPS,
95+ AD_LINK_SPEED_14000MBPS,
9596 AD_LINK_SPEED_20000MBPS,
9697 AD_LINK_SPEED_25000MBPS,
9798 AD_LINK_SPEED_40000MBPS,
@@ -263,6 +264,7 @@ static inline int __check_agg_selection_timer(struct port *port) · 165 unmodified lines
263264 * %AD_LINK_SPEED_2500MBPS,
264265 * %AD_LINK_SPEED_5000MBPS,
265266 * %AD_LINK_SPEED_10000MBPS
267+ * %AD_LINK_SPEED_14000MBPS,
266268 * %AD_LINK_SPEED_20000MBPS
267269 * %AD_LINK_SPEED_25000MBPS
268270 * %AD_LINK_SPEED_40000MBPS
@@ -308,6 +310,10 @@ static u16 __get_link_speed(struct port *port) · 39 unmodified lines
308310 speed = AD_LINK_SPEED_10000MBPS;
309311 break;
310312
313+ case SPEED_14000:
314+ speed = AD_LINK_SPEED_14000MBPS;
315+ break;
316+
311317 case SPEED_20000:
312318 speed = AD_LINK_SPEED_20000MBPS;
313319 break;
@@ -725,6 +731,9 @@ static u32 __get_agg_bandwidth(struct aggregator *aggregator) · 411 unmodified lines
725731 case AD_LINK_SPEED_10000MBPS:
726732 bandwidth = nports * 10000;
727733 break;
734+ case AD_LINK_SPEED_14000MBPS:
735+ bandwidth = nports * 14000;
736+ break;
728737 case AD_LINK_SPEED_20000MBPS:
729738 bandwidth = nports * 20000;
730739 break;