From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 17 Jun 2022 03:13:52 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9cbc9911260f24cd3ce2bfb3bcdf4792366a5745;p=linux.git

Merge git://git./linux/kernel/git/netdev/net

No conflicts.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

9cbc9911260f24cd3ce2bfb3bcdf4792366a5745
diff --cc drivers/net/ethernet/intel/iavf/iavf_main.c
index 95772e17e5bef,f3ecb3bca33dd..541103909ef4a
--- a/drivers/net/ethernet/intel/iavf/iavf_main.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@@ -983,9 -983,8 +983,9 @@@ struct iavf_mac_filter *iavf_add_filter
  
  		list_add_tail(&f->list, &adapter->mac_filter_list);
  		f->add = true;
 +		f->add_handled = false;
  		f->is_new_mac = true;
- 		f->is_primary = false;
+ 		f->is_primary = ether_addr_equal(macaddr, adapter->hw.mac.addr);
  		adapter->aq_required |= IAVF_FLAG_AQ_ADD_MAC_FILTER;
  	} else {
  		f->remove = false;