ixgbe: Fix SR-IOV VLAN pool configuration

Orabug: 23177316

The code for checking the PF bit in ixgbe_set_vf_vlan_msg was using the
wrong offset and as a result it was pulling the VLAN off of the PF even if
there were VFs numbered greater than 40 that still had the VLAN enabled.

Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 8e8e9a0b7df0194e95bb1d657f9edbdc6363f082)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index 5f663ed8d7a542a9e5b011e2de5c930f0daf6db4..c98325f6bf86f6f3de6f0e36a949456ae2134708 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -884,10 +884,10 @@ static int ixgbe_set_vf_vlan_msg(struct ixgbe_adapter *adapter,
                        bits = IXGBE_READ_REG(hw, IXGBE_VLVFB(reg_ndx * 2));
                        bits &= ~(1 << VMDQ_P(0));
                        bits |= IXGBE_READ_REG(hw,
-                                              IXGBE_VLVFB(reg_ndx * 2) + 1);
+                                              IXGBE_VLVFB(reg_ndx * 2 + 1));
                } else {
                        bits = IXGBE_READ_REG(hw,
-                                             IXGBE_VLVFB(reg_ndx * 2) + 1);
+                                             IXGBE_VLVFB(reg_ndx * 2 + 1));
                        bits &= ~(1 << (VMDQ_P(0) - 32));
                        bits |= IXGBE_READ_REG(hw, IXGBE_VLVFB(reg_ndx * 2));
                }