netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Anjali Singhai Jain <anjali.singhai@intel.com>,
	netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
	Catherine Sullivan <catherine.sullivan@intel.com>,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next v2 08/12] i40e: Remove a redundant filter addition
Date: Thu,  6 Mar 2014 18:59:20 -0800	[thread overview]
Message-ID: <1394161164-26645-9-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1394161164-26645-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: Anjali Singhai Jain <anjali.singhai@intel.com>

Remove a redundant filter addition to stop FW complaints about a redundant
filter removal.

Change-ID: I22bef6b682bd8d43432557e6e2b3e73ffb27b985
Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/i40e/i40e_main.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 46b3507..50d0032 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -1965,11 +1965,14 @@ static int i40e_vlan_rx_add_vid(struct net_device *netdev,
 
 	netdev_info(netdev, "adding %pM vid=%d\n", netdev->dev_addr, vid);
 
-	/* If the network stack called us with vid = 0, we should
-	 * indicate to i40e_vsi_add_vlan() that we want to receive
-	 * any traffic (i.e. with any vlan tag, or untagged)
+	/* If the network stack called us with vid = 0 then
+	 * it is asking to receive priority tagged packets with
+	 * vlan id 0.  Our HW receives them by default when configured
+	 * to receive untagged packets so there is no need to add an
+	 * extra filter for vlan 0 tagged packets.
 	 */
-	ret = i40e_vsi_add_vlan(vsi, vid ? vid : I40E_VLAN_ANY);
+	if (vid)
+		ret = i40e_vsi_add_vlan(vsi, vid);
 
 	if (!ret && (vid < VLAN_N_VID))
 		set_bit(vid, vsi->active_vlans);
-- 
1.8.3.1

  parent reply	other threads:[~2014-03-07  2:59 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-07  2:59 [net-next v2 00/12][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2014-03-07  2:59 ` [net-next v2 01/12] i40evf: Enable the ndo_set_features netdev op Jeff Kirsher
2014-03-07  2:59 ` [net-next v2 02/12] i40e: Flow Director sideband accounting Jeff Kirsher
2014-03-07  2:59 ` [net-next v2 03/12] i40e: Prevent overflow due to kzalloc Jeff Kirsher
2014-03-07  2:59 ` [net-next v2 04/12] i40e/i40evf: i40e implementation for skb_set_hash Jeff Kirsher
2014-03-07  2:59 ` [net-next v2 05/12] i40e: clean up comment style Jeff Kirsher
2014-03-07  2:59 ` [net-next v2 06/12] i40e: Remove a FW workaround for Number of MSIX vectors Jeff Kirsher
2014-03-07  2:59 ` [net-next v2 07/12] i40e: count timeout events Jeff Kirsher
2014-03-07  2:59 ` Jeff Kirsher [this message]
2014-03-07  2:59 ` [net-next v2 09/12] i40e: Fix static checker warning Jeff Kirsher
2014-03-07  2:59 ` [net-next v2 10/12] i40e: fix nvm version and remove firmware report Jeff Kirsher
2014-03-07  2:59 ` [net-next v2 11/12] i40e/i40evf: carefully fill tx ring Jeff Kirsher
2014-03-09 19:52   ` Ben Hutchings
2014-03-07  2:59 ` [net-next v2 12/12] i40e/i40evf: Bump pf&vf build versions Jeff Kirsher
2014-03-07 21:19 ` [net-next v2 00/12][pull request] Intel Wired LAN Driver Updates David Miller
2014-03-07 21:37   ` Jeff Kirsher

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=1394161164-26645-9-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=anjali.singhai@intel.com \
    --cc=catherine.sullivan@intel.com \
    --cc=davem@davemloft.net \
    --cc=gospo@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=sassmann@redhat.com \
    /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).