Merge branch 'addr_compare'
Ding Tianhong says:
====================
slight optimization of addr compare for net modules
This is the second patchset for slight optimization of address compare,
mainly for net tree, just following the Joe's opinion, it will help review
the code for maintainers and supports.
v2: Change some style for patch 2.
According Eric's suggestion, use the ether_addr_equal_64bits to instead
of ether_addr_equal for patch 19.
In fact, there are a lot of places which could use ether_addr_equal_64bits
to instead of ether_addr_equal, but not this time, thanks for Joe's
opinion.
v3: Change some style for patch 11/19:
(net: packetengines: slight optimization of addr compare).
Joe pointed out that is_broadcast_ether_addr(addr) would be appropriate here,
but this should be left alone and not in this patch, so fix it later.
In the patch (net: caif: slight optimization of addr compare), the operand for
memcmp is not mac address, so it is unsuitable to use the ether_addr_equal
to compare a non mac address, so remove the patch from the series.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
commit
e971522864
|
|
@ -252,8 +252,7 @@ static int el3_isa_id_sequence(__be16 *phys_addr)
|
|||
for (i = 0; i < el3_cards; i++) {
|
||||
struct el3_private *lp = netdev_priv(el3_devs[i]);
|
||||
if (lp->type == EL3_PNP &&
|
||||
!memcmp(phys_addr, el3_devs[i]->dev_addr,
|
||||
ETH_ALEN)) {
|
||||
ether_addr_equal(phys_addr, el3_devs[i]->dev_addr)) {
|
||||
if (el3_debug > 3)
|
||||
pr_debug("3c509 with address %02x %02x %02x %02x %02x %02x was found by ISAPnP\n",
|
||||
phys_addr[0] & 0xff, phys_addr[0] >> 8,
|
||||
|
|
|
|||
|
|
@ -663,7 +663,7 @@ static int bnx2x_check_mac_add(struct bnx2x *bp,
|
|||
|
||||
/* Check if a requested MAC already exists */
|
||||
list_for_each_entry(pos, &o->head, link)
|
||||
if (!memcmp(data->mac.mac, pos->u.mac.mac, ETH_ALEN) &&
|
||||
if (ether_addr_equal(data->mac.mac, pos->u.mac.mac) &&
|
||||
(data->mac.is_inner_mac == pos->u.mac.is_inner_mac))
|
||||
return -EEXIST;
|
||||
|
||||
|
|
@ -696,8 +696,7 @@ static int bnx2x_check_vlan_mac_add(struct bnx2x *bp,
|
|||
|
||||
list_for_each_entry(pos, &o->head, link)
|
||||
if ((data->vlan_mac.vlan == pos->u.vlan_mac.vlan) &&
|
||||
(!memcmp(data->vlan_mac.mac, pos->u.vlan_mac.mac,
|
||||
ETH_ALEN)) &&
|
||||
ether_addr_equal_unaligned(data->vlan_mac.mac, pos->u.vlan_mac.mac) &&
|
||||
(data->vlan_mac.is_inner_mac ==
|
||||
pos->u.vlan_mac.is_inner_mac))
|
||||
return -EEXIST;
|
||||
|
|
@ -716,7 +715,7 @@ static struct bnx2x_vlan_mac_registry_elem *
|
|||
DP(BNX2X_MSG_SP, "Checking MAC %pM for DEL command\n", data->mac.mac);
|
||||
|
||||
list_for_each_entry(pos, &o->head, link)
|
||||
if ((!memcmp(data->mac.mac, pos->u.mac.mac, ETH_ALEN)) &&
|
||||
if (ether_addr_equal(data->mac.mac, pos->u.mac.mac) &&
|
||||
(data->mac.is_inner_mac == pos->u.mac.is_inner_mac))
|
||||
return pos;
|
||||
|
||||
|
|
@ -751,8 +750,7 @@ static struct bnx2x_vlan_mac_registry_elem *
|
|||
|
||||
list_for_each_entry(pos, &o->head, link)
|
||||
if ((data->vlan_mac.vlan == pos->u.vlan_mac.vlan) &&
|
||||
(!memcmp(data->vlan_mac.mac, pos->u.vlan_mac.mac,
|
||||
ETH_ALEN)) &&
|
||||
ether_addr_equal_unaligned(data->vlan_mac.mac, pos->u.vlan_mac.mac) &&
|
||||
(data->vlan_mac.is_inner_mac ==
|
||||
pos->u.vlan_mac.is_inner_mac))
|
||||
return pos;
|
||||
|
|
|
|||
|
|
@ -3616,7 +3616,7 @@ enum sample_bulletin_result bnx2x_sample_bulletin(struct bnx2x *bp)
|
|||
|
||||
/* the mac address in bulletin board is valid and is new */
|
||||
if (bulletin.valid_bitmap & 1 << MAC_ADDR_VALID &&
|
||||
memcmp(bulletin.mac, bp->old_bulletin.mac, ETH_ALEN)) {
|
||||
!ether_addr_equal(bulletin.mac, bp->old_bulletin.mac)) {
|
||||
/* update new mac to net device */
|
||||
memcpy(bp->dev->dev_addr, bulletin.mac, ETH_ALEN);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1714,7 +1714,7 @@ static void bnx2x_vf_mbx_set_q_filters(struct bnx2x *bp,
|
|||
|
||||
/* ...and only the mac set by the ndo */
|
||||
if (filters->n_mac_vlan_filters == 1 &&
|
||||
memcmp(filters->filters->mac, bulletin->mac, ETH_ALEN)) {
|
||||
!ether_addr_equal(filters->filters->mac, bulletin->mac)) {
|
||||
BNX2X_ERR("VF[%d] requested the addition of a mac address not matching the one configured by set_vf_mac ndo\n",
|
||||
vf->abs_vfid);
|
||||
|
||||
|
|
|
|||
|
|
@ -182,7 +182,7 @@ static struct net_device *get_iff_from_mac(struct adapter *adapter,
|
|||
for_each_port(adapter, i) {
|
||||
struct net_device *dev = adapter->port[i];
|
||||
|
||||
if (!memcmp(dev->dev_addr, mac, ETH_ALEN)) {
|
||||
if (ether_addr_equal(dev->dev_addr, mac)) {
|
||||
rcu_read_lock();
|
||||
if (vlan && vlan != VLAN_VID_MASK) {
|
||||
dev = __vlan_find_dev_deep(dev, htons(ETH_P_8021Q), vlan);
|
||||
|
|
|
|||
|
|
@ -429,7 +429,7 @@ found:
|
|||
} else {
|
||||
e->state = neigh->nud_state & NUD_CONNECTED ?
|
||||
L2T_STATE_VALID : L2T_STATE_STALE;
|
||||
if (memcmp(e->dmac, neigh->ha, 6))
|
||||
if (!ether_addr_equal(e->dmac, neigh->ha))
|
||||
setup_l2e_send_pending(dev, NULL, e);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ static int enic_are_pp_different(struct enic_port_profile *pp1,
|
|||
return strcmp(pp1->name, pp2->name) | !!memcmp(pp1->instance_uuid,
|
||||
pp2->instance_uuid, PORT_UUID_MAX) |
|
||||
!!memcmp(pp1->host_uuid, pp2->host_uuid, PORT_UUID_MAX) |
|
||||
!!memcmp(pp1->mac_addr, pp2->mac_addr, ETH_ALEN);
|
||||
!ether_addr_equal(pp1->mac_addr, pp2->mac_addr);
|
||||
}
|
||||
|
||||
static int enic_pp_preassociate(struct enic *enic, int vf,
|
||||
|
|
|
|||
|
|
@ -287,7 +287,7 @@ static int be_mac_addr_set(struct net_device *netdev, void *p)
|
|||
/* The MAC change did not happen, either due to lack of privilege
|
||||
* or PF didn't pre-provision.
|
||||
*/
|
||||
if (memcmp(addr->sa_data, mac, ETH_ALEN)) {
|
||||
if (!ether_addr_equal(addr->sa_data, mac)) {
|
||||
status = -EPERM;
|
||||
goto err;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1745,7 +1745,7 @@ static int igbvf_set_mac(struct net_device *netdev, void *p)
|
|||
|
||||
hw->mac.ops.rar_set(hw, hw->mac.addr, 0);
|
||||
|
||||
if (memcmp(addr->sa_data, hw->mac.addr, 6))
|
||||
if (!ether_addr_equal(addr->sa_data, hw->mac.addr))
|
||||
return -EADDRNOTAVAIL;
|
||||
|
||||
memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
|
||||
|
|
|
|||
|
|
@ -715,8 +715,7 @@ static int ixgbe_set_vf_mac_addr(struct ixgbe_adapter *adapter,
|
|||
}
|
||||
|
||||
if (adapter->vfinfo[vf].pf_set_mac &&
|
||||
memcmp(adapter->vfinfo[vf].vf_mac_addresses, new_mac,
|
||||
ETH_ALEN)) {
|
||||
!ether_addr_equal(adapter->vfinfo[vf].vf_mac_addresses, new_mac)) {
|
||||
e_warn(drv,
|
||||
"VF %d attempted to override administratively set MAC address\n"
|
||||
"Reload the VF driver to resume operations\n",
|
||||
|
|
|
|||
|
|
@ -841,7 +841,7 @@ static void update_mclist_flags(struct mlx4_en_priv *priv,
|
|||
list_for_each_entry(dst_tmp, dst, list) {
|
||||
found = false;
|
||||
list_for_each_entry(src_tmp, src, list) {
|
||||
if (!memcmp(dst_tmp->addr, src_tmp->addr, ETH_ALEN)) {
|
||||
if (ether_addr_equal(dst_tmp->addr, src_tmp->addr)) {
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
|
|
@ -856,7 +856,7 @@ static void update_mclist_flags(struct mlx4_en_priv *priv,
|
|||
list_for_each_entry(src_tmp, src, list) {
|
||||
found = false;
|
||||
list_for_each_entry(dst_tmp, dst, list) {
|
||||
if (!memcmp(dst_tmp->addr, src_tmp->addr, ETH_ALEN)) {
|
||||
if (ether_addr_equal(dst_tmp->addr, src_tmp->addr)) {
|
||||
dst_tmp->action = MCLIST_NONE;
|
||||
found = true;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -3634,7 +3634,7 @@ static int validate_eth_header_mac(int slave, struct _rule_hw *eth_header,
|
|||
!is_broadcast_ether_addr(eth_header->eth.dst_mac)) {
|
||||
list_for_each_entry_safe(res, tmp, rlist, list) {
|
||||
be_mac = cpu_to_be64(res->mac << 16);
|
||||
if (!memcmp(&be_mac, eth_header->eth.dst_mac, ETH_ALEN))
|
||||
if (ether_addr_equal((u8 *)&be_mac, eth_header->eth.dst_mac))
|
||||
return 0;
|
||||
}
|
||||
pr_err("MAC %pM doesn't belong to VF %d, Steering rule rejected\n",
|
||||
|
|
|
|||
|
|
@ -4128,10 +4128,10 @@ static int hw_add_addr(struct ksz_hw *hw, u8 *mac_addr)
|
|||
int i;
|
||||
int j = ADDITIONAL_ENTRIES;
|
||||
|
||||
if (!memcmp(hw->override_addr, mac_addr, ETH_ALEN))
|
||||
if (ether_addr_equal(hw->override_addr, mac_addr))
|
||||
return 0;
|
||||
for (i = 0; i < hw->addr_list_size; i++) {
|
||||
if (!memcmp(hw->address[i], mac_addr, ETH_ALEN))
|
||||
if (ether_addr_equal(hw->address[i], mac_addr))
|
||||
return 0;
|
||||
if (ADDITIONAL_ENTRIES == j && empty_addr(hw->address[i]))
|
||||
j = i;
|
||||
|
|
@ -4149,7 +4149,7 @@ static int hw_del_addr(struct ksz_hw *hw, u8 *mac_addr)
|
|||
int i;
|
||||
|
||||
for (i = 0; i < hw->addr_list_size; i++) {
|
||||
if (!memcmp(hw->address[i], mac_addr, ETH_ALEN)) {
|
||||
if (ether_addr_equal(hw->address[i], mac_addr)) {
|
||||
memset(hw->address[i], 0, ETH_ALEN);
|
||||
writel(0, hw->io + ADD_ADDR_INCR * i +
|
||||
KS_ADD_ADDR_0_HI);
|
||||
|
|
@ -7104,8 +7104,7 @@ static int pcidev_init(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||
ETH_ALEN);
|
||||
else {
|
||||
memcpy(dev->dev_addr, sw->other_addr, ETH_ALEN);
|
||||
if (!memcmp(sw->other_addr, hw->override_addr,
|
||||
ETH_ALEN))
|
||||
if (ether_addr_equal(sw->other_addr, hw->override_addr))
|
||||
dev->dev_addr[5] += port->first_port;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1430,7 +1430,7 @@ vxge_search_mac_addr_in_da_table(struct vxge_vpath *vpath, struct macInfo *mac)
|
|||
return status;
|
||||
}
|
||||
|
||||
while (memcmp(mac->macaddr, macaddr, ETH_ALEN)) {
|
||||
while (!ether_addr_equal(mac->macaddr, macaddr)) {
|
||||
status = vxge_hw_vpath_mac_addr_get_next(vpath->handle,
|
||||
macaddr, macmask);
|
||||
if (status != VXGE_HW_OK)
|
||||
|
|
|
|||
|
|
@ -1053,7 +1053,7 @@ static int yellowfin_rx(struct net_device *dev)
|
|||
struct sk_buff *rx_skb = yp->rx_skbuff[entry];
|
||||
s16 frame_status;
|
||||
u16 desc_status;
|
||||
int data_size;
|
||||
int data_size, yf_size;
|
||||
u8 *buf_addr;
|
||||
|
||||
if(!desc->result_status)
|
||||
|
|
@ -1070,6 +1070,9 @@ static int yellowfin_rx(struct net_device *dev)
|
|||
__func__, frame_status);
|
||||
if (--boguscnt < 0)
|
||||
break;
|
||||
|
||||
yf_size = sizeof(struct yellowfin_desc);
|
||||
|
||||
if ( ! (desc_status & RX_EOP)) {
|
||||
if (data_size != 0)
|
||||
netdev_warn(dev, "Oversized Ethernet frame spanned multiple buffers, status %04x, data_size %d!\n",
|
||||
|
|
@ -1096,12 +1099,12 @@ static int yellowfin_rx(struct net_device *dev)
|
|||
if (status2 & 0x80) dev->stats.rx_dropped++;
|
||||
#ifdef YF_PROTOTYPE /* Support for prototype hardware errata. */
|
||||
} else if ((yp->flags & HasMACAddrBug) &&
|
||||
memcmp(le32_to_cpu(yp->rx_ring_dma +
|
||||
entry*sizeof(struct yellowfin_desc)),
|
||||
dev->dev_addr, 6) != 0 &&
|
||||
memcmp(le32_to_cpu(yp->rx_ring_dma +
|
||||
entry*sizeof(struct yellowfin_desc)),
|
||||
"\377\377\377\377\377\377", 6) != 0) {
|
||||
!ether_addr_equal(le32_to_cpu(yp->rx_ring_dma +
|
||||
entry * yf_size),
|
||||
dev->dev_addr) &&
|
||||
!ether_addr_equal(le32_to_cpu(yp->rx_ring_dma +
|
||||
entry * yf_size),
|
||||
"\377\377\377\377\377\377")) {
|
||||
if (bogus_rx++ == 0)
|
||||
netdev_warn(dev, "Bad frame to %pM\n",
|
||||
buf_addr);
|
||||
|
|
|
|||
|
|
@ -661,7 +661,7 @@ static int nx_p3_nic_add_mac(struct netxen_adapter *adapter,
|
|||
list_for_each(head, del_list) {
|
||||
cur = list_entry(head, nx_mac_list_t, list);
|
||||
|
||||
if (memcmp(addr, cur->mac_addr, ETH_ALEN) == 0) {
|
||||
if (ether_addr_equal(addr, cur->mac_addr)) {
|
||||
list_move_tail(head, &adapter->mac_list);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -462,7 +462,7 @@ int qlcnic_nic_del_mac(struct qlcnic_adapter *adapter, const u8 *addr)
|
|||
/* Delete MAC from the existing list */
|
||||
list_for_each(head, &adapter->mac_list) {
|
||||
cur = list_entry(head, struct qlcnic_mac_vlan_list, list);
|
||||
if (memcmp(addr, cur->mac_addr, ETH_ALEN) == 0) {
|
||||
if (ether_addr_equal(addr, cur->mac_addr)) {
|
||||
err = qlcnic_sre_macaddr_change(adapter, cur->mac_addr,
|
||||
0, QLCNIC_MAC_DEL);
|
||||
if (err)
|
||||
|
|
@ -483,7 +483,7 @@ int qlcnic_nic_add_mac(struct qlcnic_adapter *adapter, const u8 *addr, u16 vlan)
|
|||
/* look up if already exists */
|
||||
list_for_each(head, &adapter->mac_list) {
|
||||
cur = list_entry(head, struct qlcnic_mac_vlan_list, list);
|
||||
if (memcmp(addr, cur->mac_addr, ETH_ALEN) == 0 &&
|
||||
if (ether_addr_equal(addr, cur->mac_addr) &&
|
||||
cur->vlan_id == vlan)
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ static struct qlcnic_filter *qlcnic_find_mac_filter(struct hlist_head *head,
|
|||
struct hlist_node *n;
|
||||
|
||||
hlist_for_each_entry_safe(tmp_fil, n, head, fnode) {
|
||||
if (!memcmp(tmp_fil->faddr, addr, ETH_ALEN) &&
|
||||
if (ether_addr_equal(tmp_fil->faddr, addr) &&
|
||||
tmp_fil->vlan_id == vlan_id)
|
||||
return tmp_fil;
|
||||
}
|
||||
|
|
@ -346,7 +346,7 @@ static void qlcnic_send_filter(struct qlcnic_adapter *adapter,
|
|||
head = &(adapter->fhash.fhead[hindex]);
|
||||
|
||||
hlist_for_each_entry_safe(tmp_fil, n, head, fnode) {
|
||||
if (!memcmp(tmp_fil->faddr, &src_addr, ETH_ALEN) &&
|
||||
if (ether_addr_equal(tmp_fil->faddr, &src_addr) &&
|
||||
tmp_fil->vlan_id == vlan_id) {
|
||||
if (jiffies > (QLCNIC_READD_AGE * HZ + tmp_fil->ftime))
|
||||
qlcnic_change_filter(adapter, &src_addr,
|
||||
|
|
|
|||
|
|
@ -313,7 +313,7 @@ static void qlcnic_delete_adapter_mac(struct qlcnic_adapter *adapter)
|
|||
|
||||
list_for_each(head, &adapter->mac_list) {
|
||||
cur = list_entry(head, struct qlcnic_mac_vlan_list, list);
|
||||
if (!memcmp(adapter->mac_addr, cur->mac_addr, ETH_ALEN)) {
|
||||
if (ether_addr_equal_unaligned(adapter->mac_addr, cur->mac_addr)) {
|
||||
qlcnic_sre_macaddr_change(adapter, cur->mac_addr,
|
||||
0, QLCNIC_MAC_DEL);
|
||||
list_del(&cur->list);
|
||||
|
|
@ -337,7 +337,7 @@ static int qlcnic_set_mac(struct net_device *netdev, void *p)
|
|||
if (!is_valid_ether_addr(addr->sa_data))
|
||||
return -EINVAL;
|
||||
|
||||
if (!memcmp(adapter->mac_addr, addr->sa_data, ETH_ALEN))
|
||||
if (ether_addr_equal_unaligned(adapter->mac_addr, addr->sa_data))
|
||||
return 0;
|
||||
|
||||
if (test_bit(__QLCNIC_DEV_UP, &adapter->state)) {
|
||||
|
|
|
|||
|
|
@ -2207,7 +2207,7 @@ static int sh_eth_tsu_find_entry(struct net_device *ndev, const u8 *addr)
|
|||
|
||||
for (i = 0; i < SH_ETH_TSU_CAM_ENTRIES; i++, reg_offset += 8) {
|
||||
sh_eth_tsu_read_entry(reg_offset, c_addr);
|
||||
if (memcmp(addr, c_addr, ETH_ALEN) == 0)
|
||||
if (ether_addr_equal(addr, c_addr))
|
||||
return i;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -356,7 +356,7 @@ static inline void sgiseeq_rx(struct net_device *dev, struct sgiseeq_private *sp
|
|||
if (pkt_status & SEEQ_RSTAT_FIG) {
|
||||
/* Packet is OK. */
|
||||
/* We don't want to receive our own packets */
|
||||
if (memcmp(rd->skb->data + 6, dev->dev_addr, ETH_ALEN)) {
|
||||
if (!ether_addr_equal(rd->skb->data + 6, dev->dev_addr)) {
|
||||
if (len > rx_copybreak) {
|
||||
skb = rd->skb;
|
||||
newskb = netdev_alloc_skb(dev, PKT_BUF_SZ);
|
||||
|
|
|
|||
|
|
@ -751,7 +751,7 @@ static struct vnet_mcast_entry *__vnet_mc_find(struct vnet *vp, u8 *addr)
|
|||
struct vnet_mcast_entry *m;
|
||||
|
||||
for (m = vp->mcast_list; m; m = m->next) {
|
||||
if (!memcmp(m->addr, addr, ETH_ALEN))
|
||||
if (ether_addr_equal(m->addr, addr))
|
||||
return m;
|
||||
}
|
||||
return NULL;
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ int cpsw_ale_match_addr(struct cpsw_ale *ale, u8 *addr, u16 vid)
|
|||
if (cpsw_ale_get_vlan_id(ale_entry) != vid)
|
||||
continue;
|
||||
cpsw_ale_get_addr(ale_entry, entry_addr);
|
||||
if (memcmp(entry_addr, addr, 6) == 0)
|
||||
if (ether_addr_equal(entry_addr, addr))
|
||||
return idx;
|
||||
}
|
||||
return -ENOENT;
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
#include "h/smc.h"
|
||||
#include "h/supern_2.h"
|
||||
#include <linux/bitrev.h>
|
||||
#include <linux/etherdevice.h>
|
||||
|
||||
#ifndef lint
|
||||
static const char ID_sccs[] = "@(#)fplustm.c 1.32 99/02/23 (C) SK " ;
|
||||
|
|
@ -1082,7 +1083,7 @@ static struct s_fpmc* mac_get_mc_table(struct s_smc *smc,
|
|||
slot = tb ;
|
||||
continue ;
|
||||
}
|
||||
if (memcmp((char *)&tb->a,(char *)own,6))
|
||||
if (!ether_addr_equal((char *)&tb->a, (char *)own))
|
||||
continue ;
|
||||
return tb;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -547,9 +547,9 @@ static __be16 plip_type_trans(struct sk_buff *skb, struct net_device *dev)
|
|||
skb_pull(skb,dev->hard_header_len);
|
||||
eth = eth_hdr(skb);
|
||||
|
||||
if(*eth->h_dest&1)
|
||||
if(is_multicast_ether_addr(eth->h_dest))
|
||||
{
|
||||
if(memcmp(eth->h_dest,dev->broadcast, ETH_ALEN)==0)
|
||||
if(ether_addr_equal_64bits(eth->h_dest, dev->broadcast))
|
||||
skb->pkt_type=PACKET_BROADCAST;
|
||||
else
|
||||
skb->pkt_type=PACKET_MULTICAST;
|
||||
|
|
|
|||
Loading…
Reference in New Issue