* [PATCH 1/7] bonding: Add 10 Gig support
@ 2006-09-01 22:08 Jay Vosburgh
2006-09-06 15:17 ` Jeff Garzik
0 siblings, 1 reply; 9+ messages in thread
From: Jay Vosburgh @ 2006-09-01 22:08 UTC (permalink / raw)
To: netdev, bonding-devel; +Cc: Jeff Garzik
Allow channel bonding to enslave a 10 Gig adapter without errors.
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Acked-by: Jay Vosburgh <fubar@us.ibm.com>
diff -urpN -X linux-2.6.18-rc4-clean/Documentation/dontdiff linux-2.6.18-rc4-clean/drivers/net/bonding/bond_3ad.c linux-2.6.18-rc4/drivers/net/bonding/bond_3ad.c
--- linux-2.6.18-rc4-clean/drivers/net/bonding/bond_3ad.c 2006-06-17 18:49:35.000000000 -0700
+++ linux-2.6.18-rc4/drivers/net/bonding/bond_3ad.c 2006-08-30 11:31:45.000000000 -0700
@@ -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_
* 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
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 ag
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 ....
}
diff -urpN -X linux-2.6.18-rc4-clean/Documentation/dontdiff linux-2.6.18-rc4-clean/drivers/net/bonding/bond_main.c linux-2.6.18-rc4/drivers/net/bonding/bond_main.c
--- linux-2.6.18-rc4-clean/drivers/net/bonding/bond_main.c 2006-08-21 13:28:43.000000000 -0700
+++ linux-2.6.18-rc4/drivers/net/bonding/bond_main.c 2006-08-30 10:49:37.000000000 -0700
@@ -638,6 +638,7 @@ verify:
case SPEED_10:
case SPEED_100:
case SPEED_1000:
+ case SPEED_10000:
break;
default:
return -1;
--
VGER BF report: H 0.0801872
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/7] bonding: Add 10 Gig support
2006-09-01 22:08 [PATCH 1/7] bonding: Add 10 Gig support Jay Vosburgh
@ 2006-09-06 15:17 ` Jeff Garzik
2006-09-06 16:41 ` Mitch Williams
0 siblings, 1 reply; 9+ messages in thread
From: Jeff Garzik @ 2006-09-06 15:17 UTC (permalink / raw)
To: Jay Vosburgh; +Cc: netdev, bonding-devel
ACK patches 1-7, but does not apply:
[jgarzik@pretzel netdev-2.6]$ git-applymbox /g/tmp/mbox ~/info/signoff.txt
7 patch(es) to process.
Applying 'bonding: Add 10 Gig support'
fatal: corrupt patch at line 10
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/7] bonding: Add 10 Gig support
2006-09-06 15:17 ` Jeff Garzik
@ 2006-09-06 16:41 ` Mitch Williams
2006-09-06 16:53 ` Jeff Garzik
2006-09-06 19:22 ` Jay Vosburgh
0 siblings, 2 replies; 9+ messages in thread
From: Mitch Williams @ 2006-09-06 16:41 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Jay Vosburgh, netdev, bonding-devel
Add 10 Gig support to bonding.
Resent due to corrupt patch.
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Acked-by: Jay Vosburgh <fubar@us.ibm.com>
diff -urpN -X linux-2.6.18-rc4-clean/Documentation/dontdiff linux-2.6.18-rc4-clean/drivers/net/bonding/bond_3ad.c linux-2.6.18-rc4/drivers/net/bonding/bond_3ad.c
--- linux-2.6.18-rc4-clean/drivers/net/bonding/bond_3ad.c 2006-06-17 18:49:35.000000000 -0700
+++ linux-2.6.18-rc4/drivers/net/bonding/bond_3ad.c 2006-08-30 11:31:45.000000000 -0700
@@ -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_
* 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
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 ag
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 ....
}
diff -urpN -X linux-2.6.18-rc4-clean/Documentation/dontdiff linux-2.6.18-rc4-clean/drivers/net/bonding/bond_main.c linux-2.6.18-rc4/drivers/net/bonding/bond_main.c
--- linux-2.6.18-rc4-clean/drivers/net/bonding/bond_main.c 2006-08-21 13:28:43.000000000 -0700
+++ linux-2.6.18-rc4/drivers/net/bonding/bond_main.c 2006-08-30 10:49:37.000000000 -0700
@@ -638,6 +638,7 @@ verify:
case SPEED_10:
case SPEED_100:
case SPEED_1000:
+ case SPEED_10000:
break;
default:
return -1;
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/7] bonding: Add 10 Gig support
2006-09-06 16:41 ` Mitch Williams
@ 2006-09-06 16:53 ` Jeff Garzik
2006-09-06 17:33 ` Gary Zambrano
2006-09-06 19:23 ` Randy.Dunlap
2006-09-06 19:22 ` Jay Vosburgh
1 sibling, 2 replies; 9+ messages in thread
From: Jeff Garzik @ 2006-09-06 16:53 UTC (permalink / raw)
To: Mitch Williams; +Cc: Jay Vosburgh, netdev, bonding-devel
Mitch Williams wrote:
> Add 10 Gig support to bonding.
>
> Resent due to corrupt patch.
>
> Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
> Acked-by: Jay Vosburgh <fubar@us.ibm.com>
Did you test with git-applymbox first?
It's still corrupt...
Applying 'bonding: Add 10 Gig support'
fatal: corrupt patch at line 10
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/7] bonding: Add 10 Gig support
2006-09-06 16:53 ` Jeff Garzik
@ 2006-09-06 17:33 ` Gary Zambrano
2006-09-06 19:23 ` Randy.Dunlap
1 sibling, 0 replies; 9+ messages in thread
From: Gary Zambrano @ 2006-09-06 17:33 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Mitch Williams, Jay Vosburgh, netdev, bonding-devel
On Wed, 2006-09-06 at 12:53 -0400, Jeff Garzik wrote:
> Mitch Williams wrote:
> > Add 10 Gig support to bonding.
> >
> > Resent due to corrupt patch.
> Did you test with git-applymbox first?
>
> It's still corrupt...
>
>
> Applying 'bonding: Add 10 Gig support'
>
> fatal: corrupt patch at line 10
>
I found that if I use git-stripspace on a patch, corruption is reported when using git-applymbox.
If git-stripspace is not used on the patch then git-applymbox will apply the patch with no errors.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/7] bonding: Add 10 Gig support
2006-09-06 16:41 ` Mitch Williams
2006-09-06 16:53 ` Jeff Garzik
@ 2006-09-06 19:22 ` Jay Vosburgh
2006-09-07 16:45 ` Mitch Williams
1 sibling, 1 reply; 9+ messages in thread
From: Jay Vosburgh @ 2006-09-06 19:22 UTC (permalink / raw)
To: Mitch Williams; +Cc: Jeff Garzik, netdev, bonding-devel
[Trying again; /usr/bin/patch didn't complain about Mitch's
original; here's a cg-diff generated from where I checked his in,
git-apply seems ok with it. The problem seems to be the empty line
between "//endallnoun" and "// compare MAC"; in the original it's a
totally empty line, from cg-diff, there's a single space on there. -J]
Add 10 Gig support to bonding.
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Acked-by: Jay Vosburgh <fubar@us.ibm.com>
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 6a40707..c24b20a 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -85,6 +85,7 @@ #define AD_LINK_SPEED_BITMASK_1MBPS
#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_
* 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
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 ag
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 ....
}
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 8b95123..110da94 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -638,6 +638,7 @@ verify:
case SPEED_10:
case SPEED_100:
case SPEED_1000:
+ case SPEED_10000:
break;
default:
return -1;
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/7] bonding: Add 10 Gig support
2006-09-06 16:53 ` Jeff Garzik
2006-09-06 17:33 ` Gary Zambrano
@ 2006-09-06 19:23 ` Randy.Dunlap
2006-09-06 20:05 ` Jeff Garzik
1 sibling, 1 reply; 9+ messages in thread
From: Randy.Dunlap @ 2006-09-06 19:23 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Mitch Williams, Jay Vosburgh, netdev, bonding-devel
On Wed, 06 Sep 2006 12:53:42 -0400 Jeff Garzik wrote:
> Mitch Williams wrote:
> > Add 10 Gig support to bonding.
> >
> > Resent due to corrupt patch.
> >
> > Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
> > Acked-by: Jay Vosburgh <fubar@us.ibm.com>
>
> Did you test with git-applymbox first?
>
> It's still corrupt...
>
>
> Applying 'bonding: Add 10 Gig support'
>
> fatal: corrupt patch at line 10
The patch applies fine for me (not using that git stuff).
Maybe a tool problem?
---
~Randy
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/7] bonding: Add 10 Gig support
2006-09-06 19:23 ` Randy.Dunlap
@ 2006-09-06 20:05 ` Jeff Garzik
0 siblings, 0 replies; 9+ messages in thread
From: Jeff Garzik @ 2006-09-06 20:05 UTC (permalink / raw)
To: Randy.Dunlap; +Cc: Mitch Williams, Jay Vosburgh, netdev, bonding-devel
Randy.Dunlap wrote:
> On Wed, 06 Sep 2006 12:53:42 -0400 Jeff Garzik wrote:
>
>> Mitch Williams wrote:
>>> Add 10 Gig support to bonding.
>>>
>>> Resent due to corrupt patch.
>>>
>>> Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
>>> Acked-by: Jay Vosburgh <fubar@us.ibm.com>
>> Did you test with git-applymbox first?
>>
>> It's still corrupt...
>>
>>
>> Applying 'bonding: Add 10 Gig support'
>>
>> fatal: corrupt patch at line 10
>
> The patch applies fine for me (not using that git stuff).
> Maybe a tool problem?
Linus says git-applymbox is more strict than patch(1). patch(1)
intentionally accepts (and attempts to correct) certain types of garbage.
Jeff
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/7] bonding: Add 10 Gig support
2006-09-06 19:22 ` Jay Vosburgh
@ 2006-09-07 16:45 ` Mitch Williams
0 siblings, 0 replies; 9+ messages in thread
From: Mitch Williams @ 2006-09-07 16:45 UTC (permalink / raw)
To: Jay Vosburgh; +Cc: Jeff Garzik, netdev, bonding-devel
Note to self: Do not use Pine EVER AGAIN.
Sorry for the badness. Evolution is my new best friend.
-Mitch
On Wed, 2006-09-06 at 12:22 -0700, Jay Vosburgh wrote:
>
> [Trying again; /usr/bin/patch didn't complain about Mitch's
> original; here's a cg-diff generated from where I checked his in,
> git-apply seems ok with it. The problem seems to be the empty line
> between "//endallnoun" and "// compare MAC"; in the original it's a
> totally empty line, from cg-diff, there's a single space on there. -J]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2006-09-07 16:45 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-01 22:08 [PATCH 1/7] bonding: Add 10 Gig support Jay Vosburgh
2006-09-06 15:17 ` Jeff Garzik
2006-09-06 16:41 ` Mitch Williams
2006-09-06 16:53 ` Jeff Garzik
2006-09-06 17:33 ` Gary Zambrano
2006-09-06 19:23 ` Randy.Dunlap
2006-09-06 20:05 ` Jeff Garzik
2006-09-06 19:22 ` Jay Vosburgh
2006-09-07 16:45 ` Mitch Williams
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).