[net-next 01/13] i40e: use ether_addr_equal_64bits
flat view
STALE4612d
SUPERSEDED: 1 (0M)
From: Jeff Kirsher <hidden>
Date: 2014-03-06 04:21:48
Subsystem:
intel ethernet drivers, networking drivers, the rest · Maintainers:
Tony Nguyen, Przemek Kitszel, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Revision v1 of 2 in this series; 1 review trailer.
Revisions (2)
- v1 current
- v2 [diff vs current]
From: Joe Perches <joe@perches.com> All ether_addr_equal tests in i40e can use the slightly more efficient ether_addr_equal_64bits. All addresses passed to the various functions that use ether_addr_equal are using structs that have 2 or more bytes of additional data after the mac addr being tested. struct i40e_mac_filter.macaddr[6] (followed by s16 vlan) struct net_device.dev_addr (pointer to char array of MAX_ADDR_LEN) struct sockaddr.sa_data (array of 14 bytes) struct netdev_hw_addr.addr (pointer to char array of MAX_ADDR_LEN) Signed-off-by: Joe Perches <joe@perches.com> Tested-by: Kavindya Deegala <redacted> Signed-off-by: Jeff Kirsher <redacted> --- drivers/net/ethernet/intel/i40e/i40e_main.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 53f3ed2..5157922 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c@@ -997,7 +997,7 @@ static struct i40e_mac_filter *i40e_find_filter(struct i40e_vsi *vsi, return NULL; list_for_each_entry(f, &vsi->mac_filter_list, list) { - if ((ether_addr_equal(macaddr, f->macaddr)) && + if (ether_addr_equal_64bits(macaddr, f->macaddr) && (vlan == f->vlan) && (!is_vf || f->is_vf) && (!is_netdev || f->is_netdev))
@@ -1025,7 +1025,7 @@ struct i40e_mac_filter *i40e_find_mac(struct i40e_vsi *vsi, u8 *macaddr, return NULL; list_for_each_entry(f, &vsi->mac_filter_list, list) { - if ((ether_addr_equal(macaddr, f->macaddr)) && + if (ether_addr_equal_64bits(macaddr, f->macaddr) && (!is_vf || f->is_vf) && (!is_netdev || f->is_netdev)) return f;
@@ -1214,7 +1214,7 @@ static int i40e_set_mac(struct net_device *netdev, void *p) netdev_info(netdev, "set mac address=%pM\n", addr->sa_data); - if (ether_addr_equal(netdev->dev_addr, addr->sa_data)) + if (ether_addr_equal_64bits(netdev->dev_addr, addr->sa_data)) return 0; if (test_bit(__I40E_DOWN, &vsi->back->state) ||
@@ -1417,21 +1417,24 @@ static void i40e_set_rx_mode(struct net_device *netdev) if (is_multicast_ether_addr(f->macaddr)) { netdev_for_each_mc_addr(mca, netdev) { - if (ether_addr_equal(mca->addr, f->macaddr)) { + if (ether_addr_equal_64bits(mca->addr, + f->macaddr)) { found = true; break; } } } else { netdev_for_each_uc_addr(uca, netdev) { - if (ether_addr_equal(uca->addr, f->macaddr)) { + if (ether_addr_equal_64bits(uca->addr, + f->macaddr)) { found = true; break; } } for_each_dev_addr(netdev, ha) { - if (ether_addr_equal(ha->addr, f->macaddr)) { + if (ether_addr_equal_64bits(ha->addr, + f->macaddr)) { found = true; break; }
@@ -1905,7 +1908,8 @@ int i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid) list_for_each_entry(f, &vsi->mac_filter_list, list) { if (is_netdev) { if (f->vlan && - ether_addr_equal(netdev->dev_addr, f->macaddr)) + ether_addr_equal_64bits(netdev->dev_addr, + f->macaddr)) filter_count++; }
--
1.8.3.1