Re: [PATCH 1/7] bonding: Add 10 Gig support
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] - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/7] bonding: Add 10 Gig support
ACK patches 1-7, but does not apply: [EMAIL PROTECTED] 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 - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/7] bonding: Add 10 Gig support
Add 10 Gig support to bonding.
Resent due to corrupt patch.
Signed-off-by: Mitch Williams [EMAIL PROTECTED]
Acked-by: Jay Vosburgh [EMAIL PROTECTED]
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.0 -0700
+++ linux-2.6.18-rc4/drivers/net/bonding/bond_3ad.c 2006-08-30
11:31:45.0 -0700
@@ -85,6 +85,7 @@
#define AD_LINK_SPEED_BITMASK_10MBPS 0x2
#define AD_LINK_SPEED_BITMASK_100MBPS 0x4
#define AD_LINK_SPEED_BITMASK_1000MBPS0x8
+#define AD_LINK_SPEED_BITMASK_1MBPS 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_1MBPS
*/
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_1:
+ speed = AD_LINK_SPEED_BITMASK_1MBPS;
+ 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_1MBPS:
+ bandwidth = aggregator-num_of_ports * 1;
+ 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.0 -0700
+++ linux-2.6.18-rc4/drivers/net/bonding/bond_main.c2006-08-30
10:49:37.0 -0700
@@ -638,6 +638,7 @@ verify:
case SPEED_10:
case SPEED_100:
case SPEED_1000:
+ case SPEED_1:
break;
default:
return -1;
-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/7] bonding: Add 10 Gig support
Mitch Williams wrote: Add 10 Gig support to bonding. Resent due to corrupt patch. Signed-off-by: Mitch Williams [EMAIL PROTECTED] Acked-by: Jay Vosburgh [EMAIL PROTECTED] Did you test with git-applymbox first? It's still corrupt... Applying 'bonding: Add 10 Gig support' fatal: corrupt patch at line 10 - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/7] bonding: Add 10 Gig support
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. - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/7] bonding: Add 10 Gig support
[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 [EMAIL PROTECTED]
Acked-by: Jay Vosburgh [EMAIL PROTECTED]
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_1000MBPS0x8
+#define AD_LINK_SPEED_BITMASK_1MBPS 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_1MBPS
*/
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_1:
+ speed = AD_LINK_SPEED_BITMASK_1MBPS;
+ 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_1MBPS:
+ bandwidth = aggregator-num_of_ports * 1;
+ 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_1:
break;
default:
return -1;
-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/7] bonding: Add 10 Gig support
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 [EMAIL PROTECTED] Acked-by: Jay Vosburgh [EMAIL PROTECTED] 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 - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/7] bonding: Add 10 Gig support
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 [EMAIL PROTECTED] Acked-by: Jay Vosburgh [EMAIL PROTECTED] 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 - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/7] bonding: Add 10 Gig support
Allow channel bonding to enslave a 10 Gig adapter without errors.
Signed-off-by: Mitch Williams [EMAIL PROTECTED]
Acked-by: Jay Vosburgh [EMAIL PROTECTED]
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.0 -0700
+++ linux-2.6.18-rc4/drivers/net/bonding/bond_3ad.c 2006-08-30
11:31:45.0 -0700
@@ -85,6 +85,7 @@
#define AD_LINK_SPEED_BITMASK_10MBPS 0x2
#define AD_LINK_SPEED_BITMASK_100MBPS 0x4
#define AD_LINK_SPEED_BITMASK_1000MBPS0x8
+#define AD_LINK_SPEED_BITMASK_1MBPS 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_1MBPS
*/
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_1:
+ speed = AD_LINK_SPEED_BITMASK_1MBPS;
+ 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_1MBPS:
+ bandwidth = aggregator-num_of_ports * 1;
+ 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.0 -0700
+++ linux-2.6.18-rc4/drivers/net/bonding/bond_main.c2006-08-30
10:49:37.0 -0700
@@ -638,6 +638,7 @@ verify:
case SPEED_10:
case SPEED_100:
case SPEED_1000:
+ case SPEED_1:
break;
default:
return -1;
--
VGER BF report: H 0.0801872
-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
