aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sk98lin
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-07-12 15:23:44 -0700
committerJeff Garzik <jeff@garzik.org>2006-07-12 18:39:21 -0400
commitf326fe768b39fe4131b1e2ca266c9c385ca307f4 (patch)
treed0afb39421131bae63303102bce25450cf16415e /drivers/net/sk98lin
parent83405f058eb78b515ccf5b9066fe0a51d55114a0 (diff)
downloadkernel_samsung_tuna-f326fe768b39fe4131b1e2ca266c9c385ca307f4.zip
kernel_samsung_tuna-f326fe768b39fe4131b1e2ca266c9c385ca307f4.tar.gz
kernel_samsung_tuna-f326fe768b39fe4131b1e2ca266c9c385ca307f4.tar.bz2
[PATCH] sk98lin: fix truncated collision threshold mask
Patch to correct broken collision threshold mask in (same problem as sky2 driver). Should be three bits wide, but the mask only allows for 1 bit to be set. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/sk98lin')
-rw-r--r--drivers/net/sk98lin/h/xmac_ii.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sk98lin/h/xmac_ii.h b/drivers/net/sk98lin/h/xmac_ii.h
index 2b19f8a..7f8e6d0 100644
--- a/drivers/net/sk98lin/h/xmac_ii.h
+++ b/drivers/net/sk98lin/h/xmac_ii.h
@@ -1473,7 +1473,7 @@ extern "C" {
#define GM_TXCR_FORCE_JAM (1<<15) /* Bit 15: Force Jam / Flow-Control */
#define GM_TXCR_CRC_DIS (1<<14) /* Bit 14: Disable insertion of CRC */
#define GM_TXCR_PAD_DIS (1<<13) /* Bit 13: Disable padding of packets */
-#define GM_TXCR_COL_THR_MSK (1<<10) /* Bit 12..10: Collision Threshold */
+#define GM_TXCR_COL_THR_MSK (7<<10) /* Bit 12..10: Collision Threshold */
#define TX_COL_THR(x) (SHIFT10(x) & GM_TXCR_COL_THR_MSK)