Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2 files changed, 2 insertions, 2 deletions

diff --git a/net/core/dv.c b/net/core/dv.c
index 3f25f4aa4e..c5deb36552 100644
--- a/net/core/dv.c
+++ b/net/core/dv.c
@@ -457,7 +457,7 @@ void divert_frame(struct sk_buff *skb)
         unsigned char                   *skb_data_end = skb->data + skb->len;
 
         /* Packet is already aimed at us, return */
-        if (!memcmp(eth, skb->dev->dev_addr, ETH_ALEN))
+        if (!compare_ether_addr(eth, skb->dev->dev_addr))
                 return;
         
         /* proto is not IP, do nothing */
diff --git a/net/core/wireless.c b/net/core/wireless.c
index 271ddb35b0..f88b0affb3 100644
--- a/net/core/wireless.c
+++ b/net/core/wireless.c
@@ -1506,7 +1506,7 @@ void wireless_spy_update(struct net_device *	dev,
 
         /* Update all records that match */
         for(i = 0; i < spydata->spy_number; i++)
-                if(!memcmp(address, spydata->spy_address[i], ETH_ALEN)) {
+                if(!compare_ether_addr(address, spydata->spy_address[i])) {
                         memcpy(&(spydata->spy_stat[i]), wstats,
                                sizeof(struct iw_quality));
                         match = i;