diff options
| author | Eilon Greenstein <eilong@broadcom.com> | 2009-01-14 21:26:51 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-15 08:28:13 -0800 |
| commit | 0c6671b0d94f706dfc20cb22d792218ba9814412 (patch) | |
| tree | 14e2c50441814544dbd3f6aba095848ffffe8203 /drivers/net/bnx2x.h | |
| parent | a5e9a7cfad5fd301ce2b7869bbf386b70aa39e7c (diff) | |
| download | kernel_samsung_tuna-0c6671b0d94f706dfc20cb22d792218ba9814412.zip kernel_samsung_tuna-0c6671b0d94f706dfc20cb22d792218ba9814412.tar.gz kernel_samsung_tuna-0c6671b0d94f706dfc20cb22d792218ba9814412.tar.bz2 | |
bnx2x: VLAN tagged packets without VLAN offload
Wrong handling of tagged packet if VLAN offload is disabled caused
packets to get corrupted
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x.h')
| -rw-r--r-- | drivers/net/bnx2x.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h index 2cd1e42..e7fbca7 100644 --- a/drivers/net/bnx2x.h +++ b/drivers/net/bnx2x.h @@ -20,6 +20,11 @@ * (you will need to reboot afterwards) */ /* #define BNX2X_STOP_ON_ERROR */ +#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) +#define BCM_VLAN 1 +#endif + + /* error/debug prints */ #define DRV_MODULE_NAME "bnx2x" @@ -78,11 +83,6 @@ #endif -#ifdef NETIF_F_HW_VLAN_TX -#define BCM_VLAN 1 -#endif - - #define U64_LO(x) (u32)(((u64)(x)) & 0xffffffff) #define U64_HI(x) (u32)(((u64)(x)) >> 32) #define HILO_U64(hi, lo) ((((u64)(hi)) << 32) + (lo)) @@ -804,6 +804,8 @@ struct bnx2x { #define TPA_ENABLE_FLAG 0x80 #define NO_MCP_FLAG 0x100 #define BP_NOMCP(bp) (bp->flags & NO_MCP_FLAG) +#define HW_VLAN_TX_FLAG 0x400 +#define HW_VLAN_RX_FLAG 0x800 int func; #define BP_PORT(bp) (bp->func % PORT_MAX) |