summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorRon Mercer <ron.mercer@qlogic.com>2009-03-09 10:59:22 +0000
committerDavid S. Miller <davem@davemloft.net>2009-03-10 04:43:54 -0700
commitc9cf0a04a0c20c26388c51052296d774ec92e2bd (patch)
treed3b8d0543ac986aab5911c4e0d9ebcdeadb45698 /drivers/net
parent1e213303d8ef2a5d43fb64d2b373858ef70cc79b (diff)
downloadblackbird-op-linux-c9cf0a04a0c20c26388c51052296d774ec92e2bd.tar.gz
blackbird-op-linux-c9cf0a04a0c20c26388c51052296d774ec92e2bd.zip
qlge: bugfix: Tell hw to strip vlan header.
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/qlge/qlge_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 6da8901b0cc3..8b6128e7f5c6 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -3073,9 +3073,9 @@ static int ql_adapter_initialize(struct ql_adapter *qdev)
mask = value << 16;
ql_write32(qdev, SYS, mask | value);
- /* Set the default queue. */
- value = NIC_RCV_CFG_DFQ;
- mask = NIC_RCV_CFG_DFQ_MASK;
+ /* Set the default queue, and VLAN behavior. */
+ value = NIC_RCV_CFG_DFQ | NIC_RCV_CFG_RV;
+ mask = NIC_RCV_CFG_DFQ_MASK | (NIC_RCV_CFG_RV << 16);
ql_write32(qdev, NIC_RCV_CFG, (mask | value));
/* Set the MPI interrupt to enabled. */
OpenPOWER on IntegriCloud