diff options
| author | Dai Haruki <dai.haruki@freescale.com> | 2008-12-16 15:30:48 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-16 15:30:48 -0800 |
| commit | 77ecaf2d5a8bfd548eed3f05c1c2e6573d5de4ba (patch) | |
| tree | cb84f04691e26ebf72df6ca8185313194c4cdf90 /drivers/net/gianfar.h | |
| parent | 12dea57be552a291e93827baeffbb91e33f587a6 (diff) | |
| download | blackbird-op-linux-77ecaf2d5a8bfd548eed3f05c1c2e6573d5de4ba.tar.gz blackbird-op-linux-77ecaf2d5a8bfd548eed3f05c1c2e6573d5de4ba.zip | |
gianfar: Fix VLAN HW feature related frame/buffer size calculation.
Optimize the VLAN checking logic as well.
Signed-off-by: Dai Haruki <dai.haruki@freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/gianfar.h')
| -rw-r--r-- | drivers/net/gianfar.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h index 449f508a5640..1bdb50c7936e 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h @@ -206,8 +206,10 @@ extern const char gfar_driver_version[]; #define RCTRL_PRSDEP_INIT 0x000000c0 #define RCTRL_PROM 0x00000008 #define RCTRL_EMEN 0x00000002 -#define RCTRL_CHECKSUMMING (RCTRL_IPCSEN \ - | RCTRL_TUCSEN | RCTRL_PRSDEP_INIT) +#define RCTRL_REQ_PARSER (RCTRL_VLEX | RCTRL_IPCSEN | \ + RCTRL_TUCSEN) +#define RCTRL_CHECKSUMMING (RCTRL_IPCSEN | RCTRL_TUCSEN | \ + RCTRL_PRSDEP_INIT) #define RCTRL_EXTHASH (RCTRL_GHTX) #define RCTRL_VLAN (RCTRL_PRSDEP_INIT) #define RCTRL_PADDING(x) ((x << 16) & RCTRL_PAL_MASK) @@ -754,8 +756,7 @@ struct gfar_private { phy_interface_t interface; char phy_bus_id[BUS_ID_SIZE]; u32 device_flags; - unsigned char vlan_enable:1, - rx_csum_enable:1, + unsigned char rx_csum_enable:1, extended_hash:1, bd_stash_en:1, wol_en:1; /* Wake-on-LAN enabled */ |
