diff options
| author |   Stephen Hemminger <shemminger@vyatta.com> | 2011-01-09 15:54:15 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-01-09 15:54:15 -0800 |
| commit | 86aa77854f47ab6f5f9c687507af1f57d2b89004 (patch) | |
| tree | ab8d3da41fbbf7c177f1ab341bc982d80498dc92 /drivers/net/sky2.h | |
| parent | sky2: fix limited auto negotiation (diff) | |
| download | linux-dev-86aa77854f47ab6f5f9c687507af1f57d2b89004.tar.xz linux-dev-86aa77854f47ab6f5f9c687507af1f57d2b89004.zip | |
sky2: convert to new VLAN model (v0.2)
This converts sky2 to new VLAN offload flags control via ethtool.
It also allows for transmit offload of vlan tagged frames which
was not possible before.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Reviewed-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -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 { u16 rx_pending; u16 rx_data_size; u16 rx_nfrags; - -#ifdef SKY2_VLAN_TAG_USED u16 rx_tag; - struct vlan_group *vlgrp; -#endif + struct { unsigned long last; u32 mac_rp; @@ -2284,6 +2281,7 @@ struct sky2_hw { #define SKY2_HW_AUTO_TX_SUM 0x00000040 /* new IP decode for Tx */ #define SKY2_HW_ADV_POWER_CTL 0x00000080 /* additional PHY power regs */ #define SKY2_HW_RSS_BROKEN 0x00000100 +#define SKY2_HW_VLAN_BROKEN 0x00000200 u8 chip_id; u8 chip_rev; |