| Message ID | 1436778517-16254-13-git-send-email-jeffrey.t.kirsher@intel.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 7/13/2015 12:08 PM, Jeff Kirsher wrote: > From: Mitch Williams <mitch.a.williams@intel.com> > 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> > --- > drivers/net/ethernet/intel/i40evf/i40evf_main.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c > index 94eff4a..07f6052 100644 > --- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c > +++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c > @@ -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; This line is indented too much. [...] WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c index 94eff4a..07f6052 100644 --- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c +++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c @@ -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; }