[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20100310051046.GA646@cpu18.student.cs>
Date: Wed, 10 Mar 2010 00:10:46 -0500
From: Nick Bowler <nbowler@...iptictech.com>
To: linux-kernel@...r.kernel.org
Cc: Alan Cox <alan@...ux.intel.com>,
Greg Kroah-Hartman <gregkh@...e.de>
Subject: [PATCH,REGRESSION] Staging: et131x: Properly disable FC in txmac.
From: Nick Bowler <nbowler@...conx.ca>
FC disable is bit 3 of the txmac ctl register, but commit
6720949d55623cb8c4cb6b06f218d8be68780a6f accidentally changed
the code to set bit 2 instead.
Signed-off-by: Nick Bowler <nbowler@...conx.ca>
---
drivers/staging/et131x/et1310_mac.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/et131x/et1310_mac.c b/drivers/staging/et131x/et1310_mac.c
index a292b1e..737a9f5 100644
--- a/drivers/staging/et131x/et1310_mac.c
+++ b/drivers/staging/et131x/et1310_mac.c
@@ -226,7 +226,7 @@ void ConfigMACRegs2(struct et131x_adapter *etdev)
}
/* Enable TXMAC */
- ctl |= 0x05; /* TX mac enable, FC disable */
+ ctl |= 0x09; /* TX mac enable, FC disable */
writel(ctl, &etdev->regs->txmac.ctl);
/* Ready to start the RXDMA/TXDMA engine */
--
1.6.4.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists