From 6e80e5a0e01f8c79cf02ba635906f24f9fcd5613 Mon Sep 17 00:00:00 2001 From: Sathya Perla Date: Sun, 26 Jun 2011 20:41:53 +0000 Subject: [PATCH] --- yaml --- r: 255942 b: refs/heads/master c: 2903dd654d8788425a9523959b02933ea6555229 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/benet/be_main.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index af5e61ddc715..2c6d7eba6057 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c814fd3669b43f32ddd505178705c02352b0ac7c +refs/heads/master: 2903dd654d8788425a9523959b02933ea6555229 diff --git a/trunk/drivers/net/benet/be_main.c b/trunk/drivers/net/benet/be_main.c index 2373d394fa71..ae281de94b99 100644 --- a/trunk/drivers/net/benet/be_main.c +++ b/trunk/drivers/net/benet/be_main.c @@ -2554,6 +2554,9 @@ static int be_setup(struct be_adapter *adapter) if (status != 0) goto tx_qs_destroy; + /* Allow all priorities by default. A GRP5 evt may modify this */ + adapter->vlan_prio_bmap = 0xff; + status = be_mcc_queues_create(adapter); if (status != 0) goto rx_qs_destroy; @@ -3419,10 +3422,6 @@ static int __devinit be_probe(struct pci_dev *pdev, } dev_info(&pdev->dev, "%s port %d\n", nic_name(pdev), adapter->port_num); - /* By default all priorities are enabled. - * Needed in case of no GRP5 evt support - */ - adapter->vlan_prio_bmap = 0xff; schedule_delayed_work(&adapter->work, msecs_to_jiffies(100)); return 0;