Skip to contentSkip to conversation

ibm_newemac: Fix EMACx_TRTR[TRT] bit shifts

PATCH Applied Dave Mitchell 3 participants 3 messages Nov 18, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ibm_newemac: Fix EMACx_TRTR[TRT] bit shifts

The TRT bit shifts were reversed for EMAC4 and non-EMAC4 during the port from ibm_emac to ibm_newemac. This patch corrects that error.

---
For those curious, these bits control the TX threshold.

 drivers/net/ibm_newemac/emac.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ibm_newemac/emac.h +2 -2
index d34adf9..f2751cb 100644
@@ -263,8 +263,8 @@ struct emac_regs {
 
 
 /* EMACx_TRTR */
-#define EMAC_TRTR_SHIFT_EMAC4		27
-#define EMAC_TRTR_SHIFT			24
+#define EMAC_TRTR_SHIFT_EMAC4		24
+#define EMAC_TRTR_SHIFT		27
 
 /* EMAC specific TX descriptor control fields (write access) */
 #define EMAC_TX_CTRL_GFCS		0x0200
Signature · 1 line
1.6.3.2
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · On Wednesday 18 November 2009 01:56:55 Dave Mitchell wrote:

The TRT bit shifts were reversed for EMAC4 and non-EMAC4 during the port from ibm_emac to ibm_newemac. This patch corrects that error.

Would be great if this could go into 2.6.32. Thanks.

Cheers,
Stefan

maintainer Applied
#2 lore raw

From: Stefan Roese <[email protected]>
Date: Wed, 18 Nov 2009 11:07:51 +0100

Quoted 11 lines · On Wednesday 18 November 2009 01:56:55 Dave Mitchell wrote:
Quoted 6 lines

The TRT bit shifts were reversed for EMAC4 and non-EMAC4 during the port from ibm_emac to ibm_newemac. This patch corrects that error.

Would be great if this could go into 2.6.32. Thanks.

Applied to net-2.6, thanks.