From patchwork Mon Jun 27 06:41:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sathya Perla X-Patchwork-Id: 102116 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1A96DB6F6F for ; Mon, 27 Jun 2011 16:50:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754123Ab1F0GoX (ORCPT ); Mon, 27 Jun 2011 02:44:23 -0400 Received: from exht1.emulex.com ([138.239.113.183]:48991 "EHLO exht1.ad.emulex.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753762Ab1F0Gle (ORCPT ); Mon, 27 Jun 2011 02:41:34 -0400 Received: from S20-BMW.localdomain (10.192.238.20) by exht1.ad.emulex.com (138.239.113.183) with Microsoft SMTP Server id 8.3.137.0; Sun, 26 Jun 2011 23:40:22 -0700 From: Sathya Perla To: CC: Sathya Perla Subject: [PATCH net-next-2.6 3/3] be2net: fix initialization of vlan_prio_bmap Date: Mon, 27 Jun 2011 12:11:53 +0530 X-Mailer: git-send-email 1.7.4 MIME-Version: 1.0 Message-ID: <9126f0fa-e344-4bf8-afe2-270985b37d75@exht1.ad.emulex.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/net/benet/be_main.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 2373d39..ae281de 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) 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;