ixgbe: update set_rx_mode to fix issues w/ macvlan

This change corrects issues where macvlan was not correctly triggering
promiscuous mode on ixgbe due to the filters not being correctly set.  It
also corrects the fact that VF rar filters were being overwritten when the
PF was reset.

CC: Shirley Ma <xma@us.ibm.com>
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 12 deletions

diff --git a/drivers/net/ixgbe/ixgbe_sriov.c b/drivers/net/ixgbe/ixgbe_sriov.c
index 66f6e62b8cb0..6e6dee04ff61 100644
--- a/drivers/net/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ixgbe/ixgbe_sriov.c
@@ -137,6 +137,7 @@ static void ixgbe_set_vmvir(struct ixgbe_adapter *adapter, u32 vid, u32 vf)
 inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf)
 {
         struct ixgbe_hw *hw = &adapter->hw;
+        int rar_entry = hw->mac.num_rar_entries - (vf + 1);
 
         /* reset offloads to defaults */
         if (adapter->vfinfo[vf].pf_vlan) {
@@ -158,26 +159,17 @@ inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf)
         /* Flush and reset the mta with the new values */
         ixgbe_set_rx_mode(adapter->netdev);
 
-        if (adapter->vfinfo[vf].rar > 0) {
-                adapter->hw.mac.ops.clear_rar(&adapter->hw,
-                                              adapter->vfinfo[vf].rar);
-                adapter->vfinfo[vf].rar = -1;
-        }
+        hw->mac.ops.clear_rar(hw, rar_entry);
 }
 
 int ixgbe_set_vf_mac(struct ixgbe_adapter *adapter,
                           int vf, unsigned char *mac_addr)
 {
         struct ixgbe_hw *hw = &adapter->hw;
-
-        adapter->vfinfo[vf].rar = hw->mac.ops.set_rar(hw, vf + 1, mac_addr,
-                                                      vf, IXGBE_RAH_AV);
-        if (adapter->vfinfo[vf].rar < 0) {
-                e_err("Could not set MAC Filter for VF %d\n", vf);
-                return -1;
-        }
+        int rar_entry = hw->mac.num_rar_entries - (vf + 1);
 
         memcpy(adapter->vfinfo[vf].vf_mac_addresses, mac_addr, 6);
+        hw->mac.ops.set_rar(hw, rar_entry, mac_addr, vf, IXGBE_RAH_AV);
 
         return 0;
 }