diff options
| author |   Stephen Hemminger <shemminger@osdl.org> | 2006-07-12 15:23:43 -0700 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2006-07-12 18:39:21 -0400 |
| commit | 83405f058eb78b515ccf5b9066fe0a51d55114a0 (patch) | |
| tree | 99ba910ead883dba2f7cf46da3a91f0178f87337 /drivers/net/skge.h | |
| parent | [PATCH] sky2: fix truncated collision threshold mask (diff) | |
| download | linux-dev-83405f058eb78b515ccf5b9066fe0a51d55114a0.tar.xz linux-dev-83405f058eb78b515ccf5b9066fe0a51d55114a0.zip | |
[PATCH] skge: 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 '')
| -rw-r--r-- | drivers/net/skge.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/skge.h b/drivers/net/skge.h index ed19ff47ce11..593387b3c0dd 100644 --- a/drivers/net/skge.h +++ b/drivers/net/skge.h @@ -1734,11 +1734,11 @@ 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) -#define TX_COL_DEF 0x04 +#define TX_COL_DEF 0x04 /* late collision after 64 byte */ /* GM_RX_CTRL 16 bit r/w Receive Control Register */ enum { |