Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94dbffd5 authored by Jay Vosburgh's avatar Jay Vosburgh Committed by Jeff Garzik
Browse files

[PATCH] bonding: Allow bonding to enslave a 10 Gig adapter 



Allow channel bonding to enslave a 10 Gig adapter without errors.

Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Acked-by: default avatarJay Vosburgh <fubar@us.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent e8126c82

drivers/net/bonding/bond_3ad.c

+10 −1
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ 
#define     AD_LINK_SPEED_BITMASK_10MBPS      0x2

#define     AD_LINK_SPEED_BITMASK_100MBPS     0x4

#define     AD_LINK_SPEED_BITMASK_1000MBPS    0x8

#define     AD_LINK_SPEED_BITMASK_10000MBPS   0x10

//endalloun



// compare MAC addresses
@@ -330,7 +331,8 @@ static inline void __release_rx_machine_lock(struct port *port) 
 *     0,

 *     %AD_LINK_SPEED_BITMASK_10MBPS,

 *     %AD_LINK_SPEED_BITMASK_100MBPS,

 *     %AD_LINK_SPEED_BITMASK_1000MBPS

 *     %AD_LINK_SPEED_BITMASK_1000MBPS,

 *     %AD_LINK_SPEED_BITMASK_10000MBPS

 */

static u16 __get_link_speed(struct port *port)

{
@@ -357,6 +359,10 @@ static u16 __get_link_speed(struct port *port) 
			speed = AD_LINK_SPEED_BITMASK_1000MBPS;

			break;



		case SPEED_10000:

			speed = AD_LINK_SPEED_BITMASK_10000MBPS;

			break;



		default:

			speed = 0; // unknown speed value from ethtool. shouldn't happen

			break;
@@ -775,6 +781,9 @@ static u32 __get_agg_bandwidth(struct aggregator *aggregator) 
		case AD_LINK_SPEED_BITMASK_1000MBPS:

			bandwidth = aggregator->num_of_ports * 1000;

			break;

		case AD_LINK_SPEED_BITMASK_10000MBPS:

			bandwidth = aggregator->num_of_ports * 10000;

			break;

		default:

			bandwidth=0; // to silent the compilor ....

		}

drivers/net/bonding/bond_main.c

+1 −0
Original line number Diff line number Diff line
@@ -638,6 +638,7 @@ static int bond_update_speed_duplex(struct slave *slave) 
	case SPEED_10:

	case SPEED_100:

	case SPEED_1000:

	case SPEED_10000:

		break;

	default:

		return -1;