Merge branch 'for-3.14' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / drivers / net / ethernet / seeq / sgiseeq.c

diff --git a/drivers/net/ethernet/seeq/sgiseeq.c b/drivers/net/ethernet/seeq/sgiseeq.c
index c765718860114f42849faa0d8086e78711c867dc..69e4fd21adb4894808d7733eb60645e3b190af54 100644 (file)
--- a/drivers/net/ethernet/seeq/sgiseeq.c
+++ b/drivers/net/ethernet/seeq/sgiseeq.c
@@ -11,7 +11,6 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
-#include <linux/init.h>
 #include <linux/types.h>
 #include <linux/interrupt.h>
 #include <linux/string.h>
@@ -356,7 +355,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);