diff options
| -rw-r--r-- | drivers/net/bonding/bond_3ad.c | 11 | ||||
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index 6a407070c2e8..c24b20aaf57f 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c | |||
| @@ -85,6 +85,7 @@ | |||
| 85 | #define AD_LINK_SPEED_BITMASK_10MBPS 0x2 | 85 | #define AD_LINK_SPEED_BITMASK_10MBPS 0x2 |
| 86 | #define AD_LINK_SPEED_BITMASK_100MBPS 0x4 | 86 | #define AD_LINK_SPEED_BITMASK_100MBPS 0x4 |
| 87 | #define AD_LINK_SPEED_BITMASK_1000MBPS 0x8 | 87 | #define AD_LINK_SPEED_BITMASK_1000MBPS 0x8 |
| 88 | #define AD_LINK_SPEED_BITMASK_10000MBPS 0x10 | ||
| 88 | //endalloun | 89 | //endalloun |
| 89 | 90 | ||
| 90 | // compare MAC addresses | 91 | // compare MAC addresses |
| @@ -330,7 +331,8 @@ static inline void __release_rx_machine_lock(struct port *port) | |||
| 330 | * 0, | 331 | * 0, |
| 331 | * %AD_LINK_SPEED_BITMASK_10MBPS, | 332 | * %AD_LINK_SPEED_BITMASK_10MBPS, |
| 332 | * %AD_LINK_SPEED_BITMASK_100MBPS, | 333 | * %AD_LINK_SPEED_BITMASK_100MBPS, |
| 333 | * %AD_LINK_SPEED_BITMASK_1000MBPS | 334 | * %AD_LINK_SPEED_BITMASK_1000MBPS, |
| 335 | * %AD_LINK_SPEED_BITMASK_10000MBPS | ||
| 334 | */ | 336 | */ |
| 335 | static u16 __get_link_speed(struct port *port) | 337 | static u16 __get_link_speed(struct port *port) |
| 336 | { | 338 | { |
| @@ -357,6 +359,10 @@ static u16 __get_link_speed(struct port *port) | |||
| 357 | speed = AD_LINK_SPEED_BITMASK_1000MBPS; | 359 | speed = AD_LINK_SPEED_BITMASK_1000MBPS; |
| 358 | break; | 360 | break; |
| 359 | 361 | ||
| 362 | case SPEED_10000: | ||
| 363 | speed = AD_LINK_SPEED_BITMASK_10000MBPS; | ||
| 364 | break; | ||
| 365 | |||
| 360 | default: | 366 | default: |
| 361 | speed = 0; // unknown speed value from ethtool. shouldn't happen | 367 | speed = 0; // unknown speed value from ethtool. shouldn't happen |
| 362 | break; | 368 | break; |
| @@ -775,6 +781,9 @@ static u32 __get_agg_bandwidth(struct aggregator *aggregator) | |||
| 775 | case AD_LINK_SPEED_BITMASK_1000MBPS: | 781 | case AD_LINK_SPEED_BITMASK_1000MBPS: |
| 776 | bandwidth = aggregator->num_of_ports * 1000; | 782 | bandwidth = aggregator->num_of_ports * 1000; |
| 777 | break; | 783 | break; |
| 784 | case AD_LINK_SPEED_BITMASK_10000MBPS: | ||
| 785 | bandwidth = aggregator->num_of_ports * 10000; | ||
| 786 | break; | ||
| 778 | default: | 787 | default: |
| 779 | bandwidth=0; // to silent the compilor .... | 788 | bandwidth=0; // to silent the compilor .... |
| 780 | } | 789 | } |
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 850aae21a2fe..13b434220ff6 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
| @@ -638,6 +638,7 @@ verify: | |||
| 638 | case SPEED_10: | 638 | case SPEED_10: |
| 639 | case SPEED_100: | 639 | case SPEED_100: |
| 640 | case SPEED_1000: | 640 | case SPEED_1000: |
| 641 | case SPEED_10000: | ||
| 641 | break; | 642 | break; |
| 642 | default: | 643 | default: |
| 643 | return -1; | 644 | return -1; |
