mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-23 01:40:30 +00:00
bonding: Introduce 4 AD link speed to fix agg_bandwidth
This patch adds [2.5|20|40|56] Gbps enum definition, and fixes aggregated bandwidth calculation based on above slave links. CC: Jay Vosburgh <j.vosburgh@gmail.com> CC: Veaceslav Falico <vfalico@gmail.com> CC: Andy Gospodarek <andy@greyhouse.net> CC: David S. Miller <davem@davemloft.net> Signed-off-by: Jianhua Xie <jianhua.xie@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
cb8dda90c2
commit
424c3232b0
@ -88,7 +88,11 @@ enum ad_link_speed_type {
|
||||
AD_LINK_SPEED_10MBPS,
|
||||
AD_LINK_SPEED_100MBPS,
|
||||
AD_LINK_SPEED_1000MBPS,
|
||||
AD_LINK_SPEED_10000MBPS
|
||||
AD_LINK_SPEED_2500MBPS,
|
||||
AD_LINK_SPEED_10000MBPS,
|
||||
AD_LINK_SPEED_20000MBPS,
|
||||
AD_LINK_SPEED_40000MBPS,
|
||||
AD_LINK_SPEED_56000MBPS
|
||||
};
|
||||
|
||||
/* compare MAC addresses */
|
||||
@ -247,7 +251,11 @@ static inline int __check_agg_selection_timer(struct port *port)
|
||||
* %AD_LINK_SPEED_10MBPS,
|
||||
* %AD_LINK_SPEED_100MBPS,
|
||||
* %AD_LINK_SPEED_1000MBPS,
|
||||
* %AD_LINK_SPEED_2500MBPS,
|
||||
* %AD_LINK_SPEED_10000MBPS
|
||||
* %AD_LINK_SPEED_20000MBPS
|
||||
* %AD_LINK_SPEED_40000MBPS
|
||||
* %AD_LINK_SPEED_56000MBPS
|
||||
*/
|
||||
static u16 __get_link_speed(struct port *port)
|
||||
{
|
||||
@ -275,10 +283,26 @@ static u16 __get_link_speed(struct port *port)
|
||||
speed = AD_LINK_SPEED_1000MBPS;
|
||||
break;
|
||||
|
||||
case SPEED_2500:
|
||||
speed = AD_LINK_SPEED_2500MBPS;
|
||||
break;
|
||||
|
||||
case SPEED_10000:
|
||||
speed = AD_LINK_SPEED_10000MBPS;
|
||||
break;
|
||||
|
||||
case SPEED_20000:
|
||||
speed = AD_LINK_SPEED_20000MBPS;
|
||||
break;
|
||||
|
||||
case SPEED_40000:
|
||||
speed = AD_LINK_SPEED_40000MBPS;
|
||||
break;
|
||||
|
||||
case SPEED_56000:
|
||||
speed = AD_LINK_SPEED_56000MBPS;
|
||||
break;
|
||||
|
||||
default:
|
||||
/* unknown speed value from ethtool. shouldn't happen */
|
||||
speed = 0;
|
||||
@ -639,9 +663,21 @@ static u32 __get_agg_bandwidth(struct aggregator *aggregator)
|
||||
case AD_LINK_SPEED_1000MBPS:
|
||||
bandwidth = aggregator->num_of_ports * 1000;
|
||||
break;
|
||||
case AD_LINK_SPEED_2500MBPS:
|
||||
bandwidth = aggregator->num_of_ports * 2500;
|
||||
break;
|
||||
case AD_LINK_SPEED_10000MBPS:
|
||||
bandwidth = aggregator->num_of_ports * 10000;
|
||||
break;
|
||||
case AD_LINK_SPEED_20000MBPS:
|
||||
bandwidth = aggregator->num_of_ports * 20000;
|
||||
break;
|
||||
case AD_LINK_SPEED_40000MBPS:
|
||||
bandwidth = aggregator->num_of_ports * 40000;
|
||||
break;
|
||||
case AD_LINK_SPEED_56000MBPS:
|
||||
bandwidth = aggregator->num_of_ports * 56000;
|
||||
break;
|
||||
default:
|
||||
bandwidth = 0; /* to silence the compiler */
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user