netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Shahed Shaikh <shahed.shaikh@qlogic.com>
To: <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, <Dept-HSGLinuxNICDev@qlogic.com>,
	Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Subject: [PATCH net 4/6] qlcnic: Fix PVID configuration on eSwitch port.
Date: Mon, 14 Apr 2014 10:02:21 -0400	[thread overview]
Message-ID: <1397484143-9708-5-git-send-email-shahed.shaikh@qlogic.com> (raw)
In-Reply-To: <1397484143-9708-1-git-send-email-shahed.shaikh@qlogic.com>

From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>

Clear older PVID before adding a newer PVID to the eSwicth port

Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
---
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
index a81ad50..c1e11f5 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
@@ -1354,6 +1354,7 @@ int qlcnic_config_switch_port(struct qlcnic_adapter *adapter,
 			arg2 &= ~BIT_3;
 		break;
 	case QLCNIC_ADD_VLAN:
+			arg1 &= ~(0x0ffff << 16);
 			arg1 |= (BIT_2 | BIT_5);
 			arg1 |= (esw_cfg->vlan_id << 16);
 			break;
-- 
1.8.1.4

  parent reply	other threads:[~2014-04-14 14:40 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-14 14:02 [PATCH net 0/6] qlcnic: Bug fixes Shahed Shaikh
2014-04-14 14:02 ` [PATCH net 1/6] qlcnic: Fix panic due to uninitialzed delayed_work struct in use Shahed Shaikh
2014-04-14 14:02 ` [PATCH net 2/6] qlcnic: Fix to send INIT_NIC_FUNC as first mailbox Shahed Shaikh
2014-04-14 14:02 ` [PATCH net 3/6] qlcnic: Fix max ring count calculation Shahed Shaikh
2014-04-14 14:02 ` Shahed Shaikh [this message]
2014-04-14 14:02 ` [PATCH net 5/6] qlcnic: Fix QLogic application/driver interface for virtual NIC configuration Shahed Shaikh
2014-04-14 14:02 ` [PATCH net 6/6] qlcnic: Do not disable SR-IOV when VFs are assigned to VMs Shahed Shaikh
2014-04-14 17:44 ` [PATCH net 0/6] qlcnic: Bug fixes David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1397484143-9708-5-git-send-email-shahed.shaikh@qlogic.com \
    --to=shahed.shaikh@qlogic.com \
    --cc=Dept-HSGLinuxNICDev@qlogic.com \
    --cc=davem@davemloft.net \
    --cc=jitendra.kalsaria@qlogic.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).