From: Alice Michael <alice.michael@intel.com>
To: intel-wired-lan@osuosl.org
Subject: [Intel-wired-lan] [next PATCH S7 9/9] i40e: Remove unicast log when VF is leaving multicast mode.
Date: Tue, 2 Jul 2019 08:22:59 -0400 [thread overview]
Message-ID: <20190702122259.79070-9-alice.michael@intel.com> (raw)
In-Reply-To: <20190702122259.79070-1-alice.michael@intel.com>
From: Czeslaw Zagorski <czeslawx.zagorski@intel.com>
This patch removes unicast log when VF is leaving multicast mode.
Added check of vf->vf_states &
I40E_VF_STATE_MC_PROMISC/I40E_VF_STATE_UC_PROMISC.
Without this commit, leaving multicast mode logs "unset unicast"
in dmsg.
Signed-off-by: Czeslaw Zagorski <czeslawx.zagorski@intel.com>
---
.../ethernet/intel/i40e/i40e_virtchnl_pf.c | 39 ++++++++++---------
1 file changed, 21 insertions(+), 18 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 618781b3b7ac..7bc4e397d56d 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -2043,30 +2043,33 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf, u8 *msg)
alluni = true;
aq_ret = i40e_config_vf_promiscuous_mode(vf, info->vsi_id, allmulti,
alluni);
- if (!aq_ret) {
- if (allmulti) {
+ if (aq_ret)
+ goto err_out;
+
+ if (allmulti) {
+ if (!test_and_set_bit(I40E_VF_STATE_MC_PROMISC,
+ &vf->vf_states))
dev_info(&pf->pdev->dev,
"VF %d successfully set multicast promiscuous mode\n",
vf->vf_id);
- set_bit(I40E_VF_STATE_MC_PROMISC, &vf->vf_states);
- } else {
- dev_info(&pf->pdev->dev,
- "VF %d successfully unset multicast promiscuous mode\n",
- vf->vf_id);
- clear_bit(I40E_VF_STATE_MC_PROMISC, &vf->vf_states);
- }
- if (alluni) {
+ } else if (test_and_clear_bit(I40E_VF_STATE_MC_PROMISC,
+ &vf->vf_states))
+ dev_info(&pf->pdev->dev,
+ "VF %d successfully unset multicast promiscuous mode\n",
+ vf->vf_id);
+
+ if (alluni) {
+ if (!test_and_set_bit(I40E_VF_STATE_UC_PROMISC,
+ &vf->vf_states))
dev_info(&pf->pdev->dev,
"VF %d successfully set unicast promiscuous mode\n",
vf->vf_id);
- set_bit(I40E_VF_STATE_UC_PROMISC, &vf->vf_states);
- } else {
- dev_info(&pf->pdev->dev,
- "VF %d successfully unset unicast promiscuous mode\n",
- vf->vf_id);
- clear_bit(I40E_VF_STATE_UC_PROMISC, &vf->vf_states);
- }
- }
+ } else if (test_and_clear_bit(I40E_VF_STATE_UC_PROMISC,
+ &vf->vf_states))
+ dev_info(&pf->pdev->dev,
+ "VF %d successfully unset unicast promiscuous mode\n",
+ vf->vf_id);
+
err_out:
/* send the response to the VF */
return i40e_vc_send_resp_to_vf(vf,
--
2.21.0
next prev parent reply other threads:[~2019-07-02 12:22 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-02 12:22 [Intel-wired-lan] [next PATCH S7 1/9] i40e: fix incorrect ethtool statistics veb and veb.tc_ Alice Michael
2019-07-02 12:22 ` [Intel-wired-lan] [next PATCH S7 2/9] i40e: make visible changed vf mac on host Alice Michael
2019-07-03 21:37 ` Bowers, AndrewX
2019-07-02 12:22 ` [Intel-wired-lan] [next PATCH S7 3/9] i40e: Log disable-fw-lldp flag change by ethtool Alice Michael
2019-07-03 21:39 ` Bowers, AndrewX
2019-07-02 12:22 ` [Intel-wired-lan] [next PATCH S7 4/9] i40e: don't report link up for a VF who hasn't enabled queues Alice Michael
2019-07-03 21:40 ` Bowers, AndrewX
2019-07-02 12:22 ` [Intel-wired-lan] [next PATCH S7 5/9] i40e: fix code comments Alice Michael
2019-07-03 21:41 ` Bowers, AndrewX
2019-07-02 12:22 ` [Intel-wired-lan] [next PATCH S7 6/9] i40e: Update visual effect for advertised FEC mode Alice Michael
2019-07-03 21:41 ` Bowers, AndrewX
2019-07-02 12:22 ` [Intel-wired-lan] [next PATCH S7 7/9] i40e: Log info when PF is entering and leaving Allmulti mode Alice Michael
2019-07-03 21:42 ` Bowers, AndrewX
2019-07-02 12:22 ` [Intel-wired-lan] [next PATCH S7 8/9] i40e: verify string count matches even on early return Alice Michael
2019-07-03 21:42 ` Bowers, AndrewX
2019-07-02 12:22 ` Alice Michael [this message]
2019-07-03 21:43 ` [Intel-wired-lan] [next PATCH S7 9/9] i40e: Remove unicast log when VF is leaving multicast mode Bowers, AndrewX
2019-07-03 21:33 ` [Intel-wired-lan] [next PATCH S7 1/9] i40e: fix incorrect ethtool statistics veb and veb.tc_ Bowers, AndrewX
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=20190702122259.79070-9-alice.michael@intel.com \
--to=alice.michael@intel.com \
--cc=intel-wired-lan@osuosl.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