diff options
Diffstat (limited to 'drivers/net/sky2.h')
-rw-r--r-- | drivers/net/sky2.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index 80bdc404f1ea..6861b0e8db9a 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h | |||
@@ -2236,11 +2236,8 @@ struct sky2_port { | |||
2236 | u16 rx_pending; | 2236 | u16 rx_pending; |
2237 | u16 rx_data_size; | 2237 | u16 rx_data_size; |
2238 | u16 rx_nfrags; | 2238 | u16 rx_nfrags; |
2239 | |||
2240 | #ifdef SKY2_VLAN_TAG_USED | ||
2241 | u16 rx_tag; | 2239 | u16 rx_tag; |
2242 | struct vlan_group *vlgrp; | 2240 | |
2243 | #endif | ||
2244 | struct { | 2241 | struct { |
2245 | unsigned long last; | 2242 | unsigned long last; |
2246 | u32 mac_rp; | 2243 | u32 mac_rp; |
@@ -2284,6 +2281,7 @@ struct sky2_hw { | |||
2284 | #define SKY2_HW_AUTO_TX_SUM 0x00000040 /* new IP decode for Tx */ | 2281 | #define SKY2_HW_AUTO_TX_SUM 0x00000040 /* new IP decode for Tx */ |
2285 | #define SKY2_HW_ADV_POWER_CTL 0x00000080 /* additional PHY power regs */ | 2282 | #define SKY2_HW_ADV_POWER_CTL 0x00000080 /* additional PHY power regs */ |
2286 | #define SKY2_HW_RSS_BROKEN 0x00000100 | 2283 | #define SKY2_HW_RSS_BROKEN 0x00000100 |
2284 | #define SKY2_HW_VLAN_BROKEN 0x00000200 | ||
2287 | 2285 | ||
2288 | u8 chip_id; | 2286 | u8 chip_id; |
2289 | u8 chip_rev; | 2287 | u8 chip_rev; |