]> err.no Git - linux-2.6/commitdiff
[PATCH] sky2: fix truncated collision threshold mask
authorStephen Hemminger <shemminger@osdl.org>
Wed, 12 Jul 2006 22:23:42 +0000 (15:23 -0700)
committerJeff Garzik <jeff@garzik.org>
Wed, 12 Jul 2006 22:39:21 +0000 (18:39 -0400)
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>
drivers/net/sky2.h

index 8a0bc5525f0a64e8024b58d550ed29c4357fc6f4..2db8d19b22d10e25ac33dc53a7b52dacb84cbe44 100644 (file)
@@ -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)