From: Ngai-Mint Kwan <ngai-mint.kwan@intel.com>
Date: Fri, 1 Apr 2016 23:17:39 +0000 (-0700)
Subject: fm10k: Reset multicast mode when deleting lport
X-Git-Tag: v4.1.12-92~3^2~126
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a5dedba31ea3300c8ccfb534928539df61b8f4ae;p=users%2Fjedix%2Flinux-maple.git

fm10k: Reset multicast mode when deleting lport

Deleting lport when multicast mode is configured to
FM10K_XCAST_MODE_ALLMULTI or FM10K_XCAST_MODE_PROMISC will result in
generating orphaned multicast-group entries in the switch manager.
Before deleting the lport, reset multicast mode to FM10K_XCAST_MODE_NONE
to flush out these multicast-group entries.

Signed-off-by: Ngai-Mint Kwan <ngai-mint.kwan@intel.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Orabug: 25394529
(cherry picked from commit 11ec36a974f59c99e8a4ff7040026569a43ab567)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
---

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
index 820450de00e44..dc63259b287c5 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
@@ -488,6 +488,10 @@ static s32 fm10k_update_lport_state_pf(struct fm10k_hw *hw, u16 glort,
 	if (!fm10k_glort_valid_pf(hw, glort))
 		return FM10K_ERR_PARAM;
 
+	/* reset multicast mode if deleting lport */
+	if (!enable)
+		fm10k_update_xcast_mode_pf(hw, glort, FM10K_XCAST_MODE_NONE);
+
 	/* construct the lport message from the 2 pieces of data we have */
 	lport_msg = ((u32)count << 16) | glort;