ixgbe: fix inconsistent clearing of the multicast table

commit cf78959c0d7afbde31498afc4212294c28e2c278 upstream.

This patch resolves an issue where the MTA table can be cleared when the
interface is reset while in promisc mode. As result IPv6 traffic between
VFs will be interrupted.

This patch makes the update of the MTA table unconditional to avoid the
inconsistent clearing on reset.

Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index a178a9caa76316c608c6538b636628efdf8a45bc..8a14f96df1eeb3dc9b9dc3cee336b2abb4d21f29 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -3825,14 +3825,6 @@ void ixgbe_set_rx_mode(struct net_device *netdev)
                if (netdev->flags & IFF_ALLMULTI) {
                        fctrl |= IXGBE_FCTRL_MPE;
                        vmolr |= IXGBE_VMOLR_MPE;
-               } else {
-                       /*
-                        * Write addresses to the MTA, if the attempt fails
-                        * then we should just turn on promiscuous mode so
-                        * that we can at least receive multicast traffic
-                        */
-                       hw->mac.ops.update_mc_addr_list(hw, netdev);
-                       vmolr |= IXGBE_VMOLR_ROMPE;
                }
                ixgbe_vlan_filter_enable(adapter);
                hw->addr_ctrl.user_set_promisc = false;
@@ -3849,6 +3841,13 @@ void ixgbe_set_rx_mode(struct net_device *netdev)
                vmolr |= IXGBE_VMOLR_ROPE;
        }
 
+       /* Write addresses to the MTA, if the attempt fails
+        * then we should just turn on promiscuous mode so
+        * that we can at least receive multicast traffic
+        */
+       hw->mac.ops.update_mc_addr_list(hw, netdev);
+       vmolr |= IXGBE_VMOLR_ROMPE;
+
        if (adapter->num_vfs)
                ixgbe_restore_vf_multicasts(adapter);