diff options
| author | Stephen Hemminger <shemminger@linux-foundation.org> | 2008-02-04 19:45:13 -0800 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2008-02-05 13:31:09 -0500 |
| commit | 39dbd9587bebedbd72be9a8a30a8c4783f3ef7eb (patch) | |
| tree | 6adb31718a27d3aa5ebc1a41097111f3c40579a9 /drivers/net/sky2.h | |
| parent | 57f78ab3b0e9338a9241aeff6ee92aecc8f8bcbb (diff) | |
| download | op-kernel-dev-39dbd9587bebedbd72be9a8a30a8c4783f3ef7eb.zip op-kernel-dev-39dbd9587bebedbd72be9a8a30a8c4783f3ef7eb.tar.gz | |
sky2: fix for Yukon FE (regression in 2.6.25)
The Yukon FE chip has a ram buffer therefore it needs the alignment
restriction and hang check workarounds.
Therefore:
* Autodetect the prescence/absence of ram buffer
* Rename the flag value to reflect this
* Use it consistently (ie don't reread register)
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/sky2.h')
| -rw-r--r-- | drivers/net/sky2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index 2bced1a..5ab5c1c 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h @@ -2045,7 +2045,7 @@ struct sky2_hw { #define SKY2_HW_FIBRE_PHY 0x00000002 #define SKY2_HW_GIGABIT 0x00000004 #define SKY2_HW_NEWER_PHY 0x00000008 -#define SKY2_HW_FIFO_HANG_CHECK 0x00000010 +#define SKY2_HW_RAM_BUFFER 0x00000010 #define SKY2_HW_NEW_LE 0x00000020 /* new LSOv2 format */ #define SKY2_HW_AUTO_TX_SUM 0x00000040 /* new IP decode for Tx */ #define SKY2_HW_ADV_POWER_CTL 0x00000080 /* additional PHY power regs */ |
