S2io: Code cleanup

Hi,
We are submitting a series of 12 patches to support our Xframe I and Xframe II line of products. The patches can be categorized as follows:

Patches 1-8 : Changes applicable to both Xframe I and II Patches 9-11: Xframe II specific features
Patch 12: Addresses issues found during testing cycle.

Please review the patches and let us know your comments.

Starting with patch 1 below.
This patch involves cosmetic changes(tabs and indentation, regrouping of transmit and receive data structures, typecasting, code cleanup).

---

diff -urpN vanilla_kernel/drivers/net/s2io-regs.h linux-2.6.12-rc6/drivers/net/s2io-regs.h
@@ -77,19 +77,18 @@ typedef struct _XENA_dev_config {
 #define ADAPTER_ECC_EN                     BIT(55)
 
 	u64 serr_source;
-#define SERR_SOURCE_PIC					BIT(0)
-#define SERR_SOURCE_TXDMA				BIT(1)
-#define SERR_SOURCE_RXDMA				BIT(2)
+#define SERR_SOURCE_PIC			BIT(0)
+#define SERR_SOURCE_TXDMA		BIT(1)
+#define SERR_SOURCE_RXDMA		BIT(2)
 #define SERR_SOURCE_MAC                 BIT(3)
 #define SERR_SOURCE_MC                  BIT(4)
 #define SERR_SOURCE_XGXS                BIT(5)
-#define	SERR_SOURCE_ANY					(SERR_SOURCE_PIC		| \
-										SERR_SOURCE_TXDMA	| \
-										SERR_SOURCE_RXDMA	| \
-										SERR_SOURCE_MAC		| \
-										SERR_SOURCE_MC      | \
-										SERR_SOURCE_XGXS)
-
+#define	SERR_SOURCE_ANY			(SERR_SOURCE_PIC	| \
+					SERR_SOURCE_TXDMA	| \
+					SERR_SOURCE_RXDMA	| \
+					SERR_SOURCE_MAC		| \
+					SERR_SOURCE_MC		| \
+					SERR_SOURCE_XGXS)
 
 	u8 unused_0[0x800 - 0x120];
 

Part of the diff is not shown here. View the raw message.

patch doesn't seem to apply :(

Can you please resend the entire series, taking into account the comments WRT patch #5?

Also, I was unable to include your fixes in my 'fixes' branch, whose speed to upstream kernel is accelerated, because patch #1 was not bug fixes.

If you want your bug fixes to go upstream as rapidly as possible, make sure they are ordered before the code cleanups and new features. This allows me to send the fixes upstream immediately, while allowing further review and testing of the cleanup/feature patches.

Jeff

Jeff,
We'll re-verify the patches against latest kernel and resend.

Since the remaining 12 patches are layered on top of the first one, it will be tough to re-order the patches at this stage. Also, we'll need to rerun the QA cycle to ensure that nothing got broken in the process of patch reordering.
We will certainly keep this in mind for our next submission.

Thanks,
Ravi

-----Original Message-----
From: Jeff Garzik [mailto:[email protected]]
Sent: Saturday, July 30, 2005 10:12 PM
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH 2.6.12.1 1/12] S2io: Code cleanup

patch doesn't seem to apply :(

Can you please resend the entire series, taking into account the comments WRT patch #5?

Also, I was unable to include your fixes in my 'fixes' branch, whose speed to upstream kernel is accelerated, because patch #1 was not bug fixes.

If you want your bug fixes to go upstream as rapidly as possible, make sure they are ordered before the code cleanups and new features. This allows me to send the fixes upstream immediately, while allowing further review and testing of the cleanup/feature patches.

Jeff

Jeff,
The entire set of patches have been resent and an additional patch13 to address earlier comments.
Pls confirm if these patches apply correctly.

Thanks,
Ravi

-----Original Message-----
From: Jeff Garzik [mailto:[email protected]]
Sent: Saturday, July 30, 2005 10:12 PM
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH 2.6.12.1 1/12] S2io: Code cleanup

patch doesn't seem to apply :(

Can you please resend the entire series, taking into account the comments WRT patch #5?

Also, I was unable to include your fixes in my 'fixes' branch, whose speed to upstream kernel is accelerated, because patch #1 was not bug fixes.

If you want your bug fixes to go upstream as rapidly as possible, make sure they are ordered before the code cleanups and new features. This allows me to send the fixes upstream immediately, while allowing further review and testing of the cleanup/feature patches.

Jeff

I'm in the process of moving to a new house, and getting a new computer lab set up.

I have email and can ACK any critical patches, but everything else must wait for 2.6.14 to open (which fits nicely into the 2.6 release cycle).

Jeff