]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
i40evf: don't delete all the filters
authorMitch Williams <mitch.a.williams@intel.com>
Mon, 27 Apr 2015 18:57:16 +0000 (14:57 -0400)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 28 Aug 2015 15:11:51 +0000 (08:11 -0700)
Orabug: 21570582

Due to an inverted conditional, the driver was marking all of its MAC
filters for deletion every time set_rx_mode was called. Depending upon
the timing of the calls to set_rx_mode and the processing of the admin
queue, the driver would (accidentally) end up with a varying number of
functional filters.

Correct this logic so that MAC filters are added and removed correctly.
Add a check for the driver's "hardware" MAC address so that this filter
doesn't get removed incorrectly.

Change-ID: Ib3e7c4a5b53df6835f164fe44cb778cb71f8aff8
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Tested-by: Jim Young <james.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 68ef169204e3a88ea4823645038d5496f66200f6)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
drivers/net/ethernet/intel/i40evf/i40evf_main.c

index 94eff4a269e69acc5da159a0d05467821f095ff5..1c2ee97d1844607ebb9cba04689191b799e732e7 100644 (file)
@@ -892,8 +892,10 @@ static void i40evf_set_rx_mode(struct net_device *netdev)
                                        break;
                                }
                        }
+                       if (ether_addr_equal(f->macaddr, adapter->hw.mac.addr))
+                               found = true;
                }
-               if (found) {
+               if (!found) {
                        f->remove = true;
                        adapter->aq_required |= I40EVF_FLAG_AQ_DEL_MAC_FILTER;
                }