From f1fdeda7c9116d19ca6a41b09213c0d81a1df391 Mon Sep 17 00:00:00 2001 From: Ron Mercer Date: Wed, 11 Mar 2009 11:55:41 +0000 Subject: [PATCH] --- yaml --- r: 132393 b: refs/heads/master c: a7a655f22c75f48e0afe8b86be03ecd70bd68b07 h: refs/heads/master i: 132391: c6b43bcd506133bafcd8b544bba305b1c67dc156 v: v3 --- [refs] | 2 +- trunk/drivers/net/qlge/qlge_main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 79ad3156c66e..ced320d8254e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3c6496dc3d94d87bb0da86cf0bf48764577bf77 +refs/heads/master: a7a655f22c75f48e0afe8b86be03ecd70bd68b07 diff --git a/trunk/drivers/net/qlge/qlge_main.c b/trunk/drivers/net/qlge/qlge_main.c index 87787b1ecab2..54d54ea03d49 100644 --- a/trunk/drivers/net/qlge/qlge_main.c +++ b/trunk/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. */