OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c3c6496
)
qlge: bugfix: Tell hw to strip vlan header.
author
Ron Mercer
<ron.mercer@qlogic.com>
Wed, 11 Mar 2009 11:55:41 +0000
(11:55 +0000)
committer
David S. Miller
<davem@davemloft.net>
Fri, 13 Mar 2009 18:27:24 +0000
(11:27 -0700)
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/qlge/qlge_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/qlge/qlge_main.c
b/drivers/net/qlge/qlge_main.c
index
87787b1
..
54d54ea
100644
(file)
--- a/
drivers/net/qlge/qlge_main.c
+++ b/
drivers/net/qlge/qlge_main.c
@@
-2984,9
+2984,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. */