diff options
author | Kris Katterjohn <kjak@users.sourceforge.net> | 2006-01-09 19:01:43 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-10 15:54:28 -0500 |
commit | d3f4a687f683f536506d0aa6b22e6cb3e79639ce (patch) | |
tree | d1f5fb7177d1dd254e63189cb89e51a86a24f171 /net/atm | |
parent | 770cfbcffdf0011ecf3a12435ecb5604c4c97a19 (diff) |
[NET]: Change memcmp(,,ETH_ALEN) to compare_ether_addr()
This changes some memcmp(one,two,ETH_ALEN) to compare_ether_addr(one,two).
Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/atm')
-rw-r--r-- | net/atm/br2684.c | 4 | ||||
-rw-r--r-- | net/atm/lec.c | 6 | ||||
-rw-r--r-- | net/atm/mpc.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c index bdb4d89730d2..1dafa9c108a7 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c | |||
@@ -296,13 +296,13 @@ static inline __be16 br_type_trans(struct sk_buff *skb, struct net_device *dev) | |||
296 | eth = eth_hdr(skb); | 296 | eth = eth_hdr(skb); |
297 | 297 | ||
298 | if (is_multicast_ether_addr(eth->h_dest)) { | 298 | if (is_multicast_ether_addr(eth->h_dest)) { |
299 | if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0) | 299 | if (!compare_ether_addr(eth->h_dest, dev->broadcast)) |
300 | skb->pkt_type = PACKET_BROADCAST; | 300 | skb->pkt_type = PACKET_BROADCAST; |
301 | else | 301 | else |
302 | skb->pkt_type = PACKET_MULTICAST; | 302 | skb->pkt_type = PACKET_MULTICAST; |
303 | } | 303 | } |
304 | 304 | ||
305 | else if (memcmp(eth->h_dest, dev->dev_addr, ETH_ALEN)) | 305 | else if (compare_ether_addr(eth->h_dest, dev->dev_addr)) |
306 | skb->pkt_type = PACKET_OTHERHOST; | 306 | skb->pkt_type = PACKET_OTHERHOST; |
307 | 307 | ||
308 | if (ntohs(eth->h_proto) >= 1536) | 308 | if (ntohs(eth->h_proto) >= 1536) |
diff --git a/net/atm/lec.c b/net/atm/lec.c index ad840b9afba8..eea051338498 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c | |||
@@ -1321,7 +1321,7 @@ static int lane2_associate_req (struct net_device *dev, u8 *lan_dst, | |||
1321 | struct sk_buff *skb; | 1321 | struct sk_buff *skb; |
1322 | struct lec_priv *priv = (struct lec_priv*)dev->priv; | 1322 | struct lec_priv *priv = (struct lec_priv*)dev->priv; |
1323 | 1323 | ||
1324 | if ( memcmp(lan_dst, dev->dev_addr, ETH_ALEN) != 0 ) | 1324 | if (compare_ether_addr(lan_dst, dev->dev_addr)) |
1325 | return (0); /* not our mac address */ | 1325 | return (0); /* not our mac address */ |
1326 | 1326 | ||
1327 | kfree(priv->tlvs); /* NULL if there was no previous association */ | 1327 | kfree(priv->tlvs); /* NULL if there was no previous association */ |
@@ -1798,7 +1798,7 @@ lec_arp_find(struct lec_priv *priv, | |||
1798 | 1798 | ||
1799 | to_return = priv->lec_arp_tables[place]; | 1799 | to_return = priv->lec_arp_tables[place]; |
1800 | while(to_return) { | 1800 | while(to_return) { |
1801 | if (memcmp(mac_addr, to_return->mac_addr, ETH_ALEN) == 0) { | 1801 | if (!compare_ether_addr(mac_addr, to_return->mac_addr)) { |
1802 | return to_return; | 1802 | return to_return; |
1803 | } | 1803 | } |
1804 | to_return = to_return->next; | 1804 | to_return = to_return->next; |
@@ -2002,7 +2002,7 @@ lec_arp_resolve(struct lec_priv *priv, unsigned char *mac_to_find, | |||
2002 | return priv->mcast_vcc; | 2002 | return priv->mcast_vcc; |
2003 | break; | 2003 | break; |
2004 | case 2: /* LANE2 wants arp for multicast addresses */ | 2004 | case 2: /* LANE2 wants arp for multicast addresses */ |
2005 | if ( memcmp(mac_to_find, bus_mac, ETH_ALEN) == 0) | 2005 | if (!compare_ether_addr(mac_to_find, bus_mac)) |
2006 | return priv->mcast_vcc; | 2006 | return priv->mcast_vcc; |
2007 | break; | 2007 | break; |
2008 | default: | 2008 | default: |
diff --git a/net/atm/mpc.c b/net/atm/mpc.c index 526d9531411f..36b7ae360232 100644 --- a/net/atm/mpc.c +++ b/net/atm/mpc.c | |||
@@ -552,7 +552,7 @@ static int mpc_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
552 | goto non_ip; /* Multi-Protocol Over ATM :-) */ | 552 | goto non_ip; /* Multi-Protocol Over ATM :-) */ |
553 | 553 | ||
554 | while (i < mpc->number_of_mps_macs) { | 554 | while (i < mpc->number_of_mps_macs) { |
555 | if (memcmp(eth->h_dest, (mpc->mps_macs + i*ETH_ALEN), ETH_ALEN) == 0) | 555 | if (!compare_ether_addr(eth->h_dest, (mpc->mps_macs + i*ETH_ALEN))) |
556 | if ( send_via_shortcut(skb, mpc) == 0 ) /* try shortcut */ | 556 | if ( send_via_shortcut(skb, mpc) == 0 ) /* try shortcut */ |
557 | return 0; /* success! */ | 557 | return 0; /* success! */ |
558 | i++; | 558 | i++; |