Commit a7731cc8 authored by Jeff Kirsher's avatar Jeff Kirsher

fm10k: update xcast mode before synchronizing multicast addresses

When the PF receives a request to update a multicast address for the VF,
it checks the enabled multicast mode first. Fix a bug where the VF tried
to set a multicast address before requesting the required xcast mode.
This ensures the multicast addresses are honored as long as the xcast
mode was allowed.
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Acked-by: default avatarMatthew Vick <matthew.vick@intel.com>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 54b3c9cf
...@@ -970,14 +970,7 @@ static void fm10k_set_rx_mode(struct net_device *dev) ...@@ -970,14 +970,7 @@ static void fm10k_set_rx_mode(struct net_device *dev)
fm10k_mbx_lock(interface); fm10k_mbx_lock(interface);
/* synchronize all of the addresses */ /* update xcast mode first, but only if it changed */
if (xcast_mode != FM10K_XCAST_MODE_PROMISC) {
__dev_uc_sync(dev, fm10k_uc_sync, fm10k_uc_unsync);
if (xcast_mode != FM10K_XCAST_MODE_ALLMULTI)
__dev_mc_sync(dev, fm10k_mc_sync, fm10k_mc_unsync);
}
/* if we aren't changing modes there is nothing to do */
if (interface->xcast_mode != xcast_mode) { if (interface->xcast_mode != xcast_mode) {
/* update VLAN table */ /* update VLAN table */
if (xcast_mode == FM10K_XCAST_MODE_PROMISC) if (xcast_mode == FM10K_XCAST_MODE_PROMISC)
...@@ -992,6 +985,13 @@ static void fm10k_set_rx_mode(struct net_device *dev) ...@@ -992,6 +985,13 @@ static void fm10k_set_rx_mode(struct net_device *dev)
interface->xcast_mode = xcast_mode; interface->xcast_mode = xcast_mode;
} }
/* synchronize all of the addresses */
if (xcast_mode != FM10K_XCAST_MODE_PROMISC) {
__dev_uc_sync(dev, fm10k_uc_sync, fm10k_uc_unsync);
if (xcast_mode != FM10K_XCAST_MODE_ALLMULTI)
__dev_mc_sync(dev, fm10k_mc_sync, fm10k_mc_unsync);
}
fm10k_mbx_unlock(interface); fm10k_mbx_unlock(interface);
} }
...@@ -1051,6 +1051,9 @@ void fm10k_restore_rx_state(struct fm10k_intfc *interface) ...@@ -1051,6 +1051,9 @@ void fm10k_restore_rx_state(struct fm10k_intfc *interface)
vid, true, 0); vid, true, 0);
} }
/* update xcast mode before syncronizing addresses */
hw->mac.ops.update_xcast_mode(hw, glort, xcast_mode);
/* synchronize all of the addresses */ /* synchronize all of the addresses */
if (xcast_mode != FM10K_XCAST_MODE_PROMISC) { if (xcast_mode != FM10K_XCAST_MODE_PROMISC) {
__dev_uc_sync(netdev, fm10k_uc_sync, fm10k_uc_unsync); __dev_uc_sync(netdev, fm10k_uc_sync, fm10k_uc_unsync);
...@@ -1058,9 +1061,6 @@ void fm10k_restore_rx_state(struct fm10k_intfc *interface) ...@@ -1058,9 +1061,6 @@ void fm10k_restore_rx_state(struct fm10k_intfc *interface)
__dev_mc_sync(netdev, fm10k_mc_sync, fm10k_mc_unsync); __dev_mc_sync(netdev, fm10k_mc_sync, fm10k_mc_unsync);
} }
/* update xcast mode */
hw->mac.ops.update_xcast_mode(hw, glort, xcast_mode);
fm10k_mbx_unlock(interface); fm10k_mbx_unlock(interface);
/* record updated xcast mode state */ /* record updated xcast mode state */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment