igb: add PF to pool

Add Pf to pool if adding a VLVF register value and the VFTA bit is
already set.

This patch addresses the unlikely situation that the PF adds a vlan
entry when the vlvf is full, and a vf later adds the vlan to the vlvf.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index f0c3a01452c8..a3c2f83fb495 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -3895,10 +3895,15 @@ static s32 igb_vlvf_set(struct igb_adapter *adapter, u32 vid, bool add, u32 vf)
 
                         /* if !enabled we need to set this up in vfta */
                         if (!(reg & E1000_VLVF_VLANID_ENABLE)) {
-                                /* add VID to filter table */
-                                igb_vfta_set(hw, vid, true);
+                                /* add VID to filter table, if bit already set
+                                 * PF must have added it outside of table */
+                                if (igb_vfta_set(hw, vid, true))
+                                        reg |= 1 << (E1000_VLVF_POOLSEL_SHIFT +
+                                                adapter->vfs_allocated_count);
                                 reg |= E1000_VLVF_VLANID_ENABLE;
                         }
+                        reg &= ~E1000_VLVF_VLANID_MASK;
+                        reg |= vid;
 
                         wr32(E1000_VLVF(i), reg);
                         return 0;