aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-07-12 15:23:42 -0700
committerJeff Garzik <jeff@garzik.org>2006-07-12 18:39:21 -0400
commitfbb88b3e0b59fbc877c884f5fc978428b2fe7aea (patch)
tree2f67002b7bb4f524915eec63b92ee42a334c30ec /drivers
parent4c2248cc57f83ce551511a6c1736383938dd9d1b (diff)
[PATCH] sky2: fix truncated collision threshold mask
Patch to correct broken collision threshold mask in sky2 driver. Should be three bits wide, but the mask only allows for 1 bit to be set. Thanks & Regards Neil Signed-off-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: Stephen Hemminger <shemminger@osdl.org> sky2.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/sky2.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 8a0bc5525f0..2db8d19b22d 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -1480,7 +1480,7 @@ enum {
GM_TXCR_FORCE_JAM = 1<<15, /* Bit 15: Force Jam / Flow-Control */
GM_TXCR_CRC_DIS = 1<<14, /* Bit 14: Disable insertion of CRC */
GM_TXCR_PAD_DIS = 1<<13, /* Bit 13: Disable padding of packets */
- GM_TXCR_COL_THR_MSK = 1<<10, /* Bit 12..10: Collision Threshold */
+ GM_TXCR_COL_THR_MSK = 7<<10, /* Bit 12..10: Collision Threshold */
};
#define TX_COL_THR(x) (((x)<<10) & GM_TXCR_COL_THR_MSK)