From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-gx0-f228.google.com (mail-gx0-f228.google.com [209.85.217.228]) by ozlabs.org (Postfix) with ESMTP id CE313B6EF5 for ; Wed, 18 Nov 2009 11:57:36 +1100 (EST) Received: by gxk28 with SMTP id 28so619414gxk.9 for ; Tue, 17 Nov 2009 16:57:34 -0800 (PST) Sender: David Mitchell From: Dave Mitchell To: netdev@vger.kernel.org Subject: [PATCH] ibm_newemac: Fix EMACx_TRTR[TRT] bit shifts Date: Tue, 17 Nov 2009 18:56:55 -0600 Message-Id: <1258505815-31261-1-git-send-email-dmitchell@appliedmicro.com> Cc: linuxppc-dev@ozlabs.org, dmitchell@appliedmicro.com List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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. Signed-off-by: Dave Mitchell Acked-by: Feng Kan Acked-by: Prodyut Hazarika --- For those curious, these bits control the TX threshold. drivers/net/ibm_newemac/emac.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ibm_newemac/emac.h b/drivers/net/ibm_newemac/emac.h index d34adf9..f2751cb 100644 --- a/drivers/net/ibm_newemac/emac.h +++ b/drivers/net/ibm_newemac/emac.h @@ -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 -- 1.6.3.2