aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSathya Perla <sathya.perla@emulex.com>2011-06-26 16:41:53 -0400
committerDavid S. Miller <davem@davemloft.net>2011-06-27 03:09:31 -0400
commit2903dd654d8788425a9523959b02933ea6555229 (patch)
treecedef512367a16c809a2e46f9df464b8c7ccfb7e
parentc814fd3669b43f32ddd505178705c02352b0ac7c (diff)
be2net: fix initialization of vlan_prio_bmap
Initialization of this field to "all priorities" must be done before MCC queue creation. As soon as the MCC queue is created, an event modifying this value may be received. Signed-off-by: Sathya Perla <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/benet/be_main.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 2373d394fa71..ae281de94b99 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -2554,6 +2554,9 @@ static int be_setup(struct be_adapter *adapter)
2554 if (status != 0) 2554 if (status != 0)
2555 goto tx_qs_destroy; 2555 goto tx_qs_destroy;
2556 2556
2557 /* Allow all priorities by default. A GRP5 evt may modify this */
2558 adapter->vlan_prio_bmap = 0xff;
2559
2557 status = be_mcc_queues_create(adapter); 2560 status = be_mcc_queues_create(adapter);
2558 if (status != 0) 2561 if (status != 0)
2559 goto rx_qs_destroy; 2562 goto rx_qs_destroy;
@@ -3419,10 +3422,6 @@ static int __devinit be_probe(struct pci_dev *pdev,
3419 } 3422 }
3420 3423
3421 dev_info(&pdev->dev, "%s port %d\n", nic_name(pdev), adapter->port_num); 3424 dev_info(&pdev->dev, "%s port %d\n", nic_name(pdev), adapter->port_num);
3422 /* By default all priorities are enabled.
3423 * Needed in case of no GRP5 evt support
3424 */
3425 adapter->vlan_prio_bmap = 0xff;
3426 3425
3427 schedule_delayed_work(&adapter->work, msecs_to_jiffies(100)); 3426 schedule_delayed_work(&adapter->work, msecs_to_jiffies(100));
3428 return 0; 3427 return 0;