leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bridge: netfilter: Use ether_addr_copy

Browse Source 
Convert the uses of memcpy to ether_addr_copy because
for some architectures it is smaller and faster.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches
2014-02-23 00:05:26 -08:00
committed by David S. Miller
parent e5a727f663
commit 0409114282
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/bridge/br_netfilter.c
View File

@@ -506,7 +506,7 @@ bridged_dnat:
1); 1);
return 0; return 0;
} }
memcpy(eth_hdr(skb)->h_dest, dev->dev_addr, ETH_ALEN); ether_addr_copy(eth_hdr(skb)->h_dest, dev->dev_addr);
skb->pkt_type = PACKET_HOST; skb->pkt_type = PACKET_HOST;
} }
} else { } else {

2
net/bridge/netfilter/ebt_among.c
View File

@@ -28,7 +28,7 @@ static bool ebt_mac_wormhash_contains(const struct ebt_mac_wormhash *wh,
uint32_t cmp[2] = { 0, 0 }; uint32_t cmp[2] = { 0, 0 };
int key = ((const unsigned char *)mac)[5]; int key = ((const unsigned char *)mac)[5];
memcpy(((char *) cmp) + 2, mac, ETH_ALEN); ether_addr_copy(((char *) cmp) + 2, mac);
start = wh->table[key]; start = wh->table[key];
limit = wh->table[key + 1]; limit = wh->table[key + 1];
if (ip) { if (ip) {

2
net/bridge/netfilter/ebt_dnat.c
View File

@@ -22,7 +22,7 @@ ebt_dnat_tg(struct sk_buff *skb, const struct xt_action_param *par)
if (!skb_make_writable(skb, 0)) if (!skb_make_writable(skb, 0))
return EBT_DROP; return EBT_DROP;
memcpy(eth_hdr(skb)->h_dest, info->mac, ETH_ALEN); ether_addr_copy(eth_hdr(skb)->h_dest, info->mac);
return info->target; return info->target;
} }

6
net/bridge/netfilter/ebt_redirect.c
View File

@@ -25,10 +25,10 @@ ebt_redirect_tg(struct sk_buff *skb, const struct xt_action_param *par)
if (par->hooknum != NF_BR_BROUTING) if (par->hooknum != NF_BR_BROUTING)
/* rcu_read_lock()ed by nf_hook_slow */ /* rcu_read_lock()ed by nf_hook_slow */
memcpy(eth_hdr(skb)->h_dest, ether_addr_copy(eth_hdr(skb)->h_dest,
br_port_get_rcu(par->in)->br->dev->dev_addr, ETH_ALEN); br_port_get_rcu(par->in)->br->dev->dev_addr);
else else
memcpy(eth_hdr(skb)->h_dest, par->in->dev_addr, ETH_ALEN); ether_addr_copy(eth_hdr(skb)->h_dest, par->in->dev_addr);
skb->pkt_type = PACKET_HOST; skb->pkt_type = PACKET_HOST;
return info->target; return info->target;
} }

2
net/bridge/netfilter/ebt_snat.c
View File

@@ -24,7 +24,7 @@ ebt_snat_tg(struct sk_buff *skb, const struct xt_action_param *par)
if (!skb_make_writable(skb, 0)) if (!skb_make_writable(skb, 0))
return EBT_DROP; return EBT_DROP;
memcpy(eth_hdr(skb)->h_source, info->mac, ETH_ALEN); ether_addr_copy(eth_hdr(skb)->h_source, info->mac);
if (!(info->target & NAT_ARP_BIT) && if (!(info->target & NAT_ARP_BIT) &&
eth_hdr(skb)->h_proto == htons(ETH_P_ARP)) { eth_hdr(skb)->h_proto == htons(ETH_P_ARP)) {
const struct arphdr *ap; const struct arphdr *ap;