dev.dpdk.org archive mirror
 help / color / mirror / Atom feed
From: Pawel Wodkowski <pawelx.wodkowski-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
To: dev-VfR2kkLFssw@public.gmane.org
Subject: [PATCH v4 2/7] pmd igb: fix VMDQ mode checking
Date: Thu, 19 Feb 2015 16:54:44 +0100	[thread overview]
Message-ID: <1424361289-30718-3-git-send-email-pawelx.wodkowski@intel.com> (raw)
In-Reply-To: <1424361289-30718-1-git-send-email-pawelx.wodkowski-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>

RX mode is an enum created by ORing flags. Change compare by value
to test a flag when enabling/disabling VLAN filtering during RX queue
setup.

Signed-off-by: Pawel Wodkowski <pawelx.wodkowski-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
 lib/librte_pmd_e1000/igb_ethdev.c | 2 +-
 lib/librte_pmd_e1000/igb_rxtx.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_pmd_e1000/igb_ethdev.c b/lib/librte_pmd_e1000/igb_ethdev.c
index 2a268b8..d451086 100644
--- a/lib/librte_pmd_e1000/igb_ethdev.c
+++ b/lib/librte_pmd_e1000/igb_ethdev.c
@@ -816,7 +816,7 @@ eth_igb_start(struct rte_eth_dev *dev)
 			ETH_VLAN_EXTEND_MASK;
 	eth_igb_vlan_offload_set(dev, mask);
 
-	if (dev->data->dev_conf.rxmode.mq_mode == ETH_MQ_RX_VMDQ_ONLY) {
+	if ((dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_VMDQ_FLAG) != 0) {
 		/* Enable VLAN filter since VMDq always use VLAN filter */
 		igb_vmdq_vlan_hw_filter_enable(dev);
 	}
diff --git a/lib/librte_pmd_e1000/igb_rxtx.c b/lib/librte_pmd_e1000/igb_rxtx.c
index 5c394a9..79c458f 100644
--- a/lib/librte_pmd_e1000/igb_rxtx.c
+++ b/lib/librte_pmd_e1000/igb_rxtx.c
@@ -2150,7 +2150,7 @@ eth_igb_rx_init(struct rte_eth_dev *dev)
 		(hw->mac.mc_filter_type << E1000_RCTL_MO_SHIFT);
 
 	/* Make sure VLAN Filters are off. */
-	if (dev->data->dev_conf.rxmode.mq_mode != ETH_MQ_RX_VMDQ_ONLY)
+	if ((dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_VMDQ_FLAG) == 0)
 		rctl &= ~E1000_RCTL_VFE;
 	/* Don't store bad packets. */
 	rctl &= ~E1000_RCTL_SBP;
-- 
1.9.1

  parent reply	other threads:[~2015-02-19 15:54 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-12 15:50 [PATCH 0/2] Enable DCB in SRIOV mode for ixgbe driver Michal Jastrzebski
     [not found] ` <1421077843-8492-1-git-send-email-michalx.k.jastrzebski-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-01-12 15:50   ` [PATCH 1/2] pmd: add DCB for VF for ixgbe Michal Jastrzebski
     [not found]     ` <1421077843-8492-2-git-send-email-michalx.k.jastrzebski-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-01-13 10:14       ` Vlad Zolotarov
     [not found]         ` <54B4EFF6.5060107-RmZWMc9puTNJc61us3aD9laTQe2KTcn/@public.gmane.org>
2015-01-13 11:00           ` Wodkowski, PawelX
2015-01-14  1:00           ` Ouyang, Changchun
2015-01-12 15:50   ` [PATCH 2/2] testpmd: fix dcb in vt mode Michal Jastrzebski
     [not found]     ` <1421077843-8492-3-git-send-email-michalx.k.jastrzebski-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-01-13 10:15       ` Vlad Zolotarov
     [not found]         ` <54B4F05A.90006-RmZWMc9puTNJc61us3aD9laTQe2KTcn/@public.gmane.org>
2015-01-13 11:08           ` Wodkowski, PawelX
2015-01-13  9:50   ` [PATCH 0/2] Enable DCB in SRIOV mode for ixgbe driver Wodkowski, PawelX
2015-01-13 10:11   ` Vlad Zolotarov
2015-01-19 13:02   ` [PATCH v2 0/4] " Pawel Wodkowski
     [not found]     ` <1421672551-11652-1-git-send-email-pawelx.wodkowski-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-01-19 13:02       ` [PATCH v2 1/4] ethdev: Allow zero rx/tx queues in SRIOV mode Pawel Wodkowski
2015-01-19 13:02       ` [PATCH v2 2/4] ethdev: prevent changing of nb_q_per_pool in rte_eth_dev_check_mq_mode() Pawel Wodkowski
     [not found]         ` <1421672551-11652-3-git-send-email-pawelx.wodkowski-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-01-20  1:32           ` Ouyang, Changchun
     [not found]             ` <F52918179C57134FAEC9EA62FA2F96251197C623-E2R4CRU6q/6iAffOGbnezLfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2015-01-20  9:09               ` Wodkowski, PawelX
2015-01-19 13:02       ` [PATCH v2 3/4] pmd: add support for DCB in SRIOV mode for ixgbe driver Pawel Wodkowski
     [not found]         ` <1421672551-11652-4-git-send-email-pawelx.wodkowski-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-01-20  1:56           ` Ouyang, Changchun
2015-01-20  6:52           ` Thomas Monjalon
2015-01-19 13:02       ` [PATCH v2 4/4] testpmd: fix dcb in vt mode Pawel Wodkowski
2015-02-19 15:54       ` [PATCH v4 0/7] Enable DCB in SRIOV mode for ixgbe driver Pawel Wodkowski
     [not found]         ` <1424361289-30718-1-git-send-email-pawelx.wodkowski-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-02-19 15:54           ` [PATCH v4 1/7] ethdev: Allow zero rx/tx queues in SRIOV mode Pawel Wodkowski
2015-02-19 15:54           ` Pawel Wodkowski [this message]
2015-02-19 15:54           ` [PATCH v4 3/7] pmd: igb/ixgbe split nb_q_per_pool to rx and tx nb_q_per_pool Pawel Wodkowski
     [not found]             ` <1424361289-30718-4-git-send-email-pawelx.wodkowski-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-02-25  3:24               ` Ouyang, Changchun
     [not found]                 ` <F52918179C57134FAEC9EA62FA2F9625119F776F-E2R4CRU6q/6iAffOGbnezLfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2015-02-25  7:47                   ` Pawel Wodkowski
2015-02-19 15:54           ` [PATCH v4 4/7] move rte_eth_dev_check_mq_mode() logic to driver Pawel Wodkowski
     [not found]             ` <1424361289-30718-5-git-send-email-pawelx.wodkowski-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-02-25  6:14               ` Ouyang, Changchun
     [not found]                 ` <F52918179C57134FAEC9EA62FA2F9625119F7B71-E2R4CRU6q/6iAffOGbnezLfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2015-02-25  9:57                   ` Pawel Wodkowski
2015-06-09  4:06             ` Wu, Jingjing
2015-02-19 15:54           ` [PATCH v4 5/7] pmd ixgbe: enable DCB in SRIOV Pawel Wodkowski
     [not found]             ` <1424361289-30718-6-git-send-email-pawelx.wodkowski-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2015-02-25  3:36               ` Ouyang, Changchun
     [not found]                 ` <F52918179C57134FAEC9EA62FA2F9625119F77BC-E2R4CRU6q/6iAffOGbnezLfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2015-02-25 11:29                   ` Pawel Wodkowski
2015-02-19 15:54           ` [PATCH v4 6/7] tespmd: fix DCB in SRIOV mode support Pawel Wodkowski
2015-02-19 15:54           ` [PATCH v4 7/7] pmd ixgbe: fix vlan setting in in PF Pawel Wodkowski
2015-06-08  3:00         ` [PATCH v4 0/7] Enable DCB in SRIOV mode for ixgbe driver Zhang, Helin

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=1424361289-30718-3-git-send-email-pawelx.wodkowski@intel.com \
    --to=pawelx.wodkowski-ral2jqcrhueavxtiumwx3w@public.gmane.org \
    --cc=dev-VfR2kkLFssw@public.gmane.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).