|
@@ -478,7 +478,7 @@ static struct vxlan_fdb *__vxlan_find_mac(struct vxlan_dev *vxlan,
|
|
struct vxlan_fdb *f;
|
|
struct vxlan_fdb *f;
|
|
|
|
|
|
hlist_for_each_entry_rcu(f, head, hlist) {
|
|
hlist_for_each_entry_rcu(f, head, hlist) {
|
|
- if (compare_ether_addr(mac, f->eth_addr) == 0)
|
|
|
|
|
|
+ if (ether_addr_equal(mac, f->eth_addr))
|
|
return f;
|
|
return f;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1049,8 +1049,7 @@ static void vxlan_rcv(struct vxlan_sock *vs,
|
|
skb->protocol = eth_type_trans(skb, vxlan->dev);
|
|
skb->protocol = eth_type_trans(skb, vxlan->dev);
|
|
|
|
|
|
/* Ignore packet loops (and multicast echo) */
|
|
/* Ignore packet loops (and multicast echo) */
|
|
- if (compare_ether_addr(eth_hdr(skb)->h_source,
|
|
|
|
- vxlan->dev->dev_addr) == 0)
|
|
|
|
|
|
+ if (ether_addr_equal(eth_hdr(skb)->h_source, vxlan->dev->dev_addr))
|
|
goto drop;
|
|
goto drop;
|
|
|
|
|
|
/* Re-examine inner Ethernet packet */
|
|
/* Re-examine inner Ethernet packet */
|
|
@@ -1320,7 +1319,7 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb)
|
|
if (n) {
|
|
if (n) {
|
|
bool diff;
|
|
bool diff;
|
|
|
|
|
|
- diff = compare_ether_addr(eth_hdr(skb)->h_dest, n->ha) != 0;
|
|
|
|
|
|
+ diff = !ether_addr_equal(eth_hdr(skb)->h_dest, n->ha);
|
|
if (diff) {
|
|
if (diff) {
|
|
memcpy(eth_hdr(skb)->h_source, eth_hdr(skb)->h_dest,
|
|
memcpy(eth_hdr(skb)->h_source, eth_hdr(skb)->h_dest,
|
|
dev->addr_len);
|
|
dev->addr_len);
|