staging: slicoss Use compare_ether_addr.

Use compare_ether_addr.

Signed-off-by: Denis Kirjanov <kirjanov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/slicoss/slic.h b/drivers/staging/slicoss/slic.h
index ccf7625b8bb388d8a9c0d171aa5eb06770b517dd..eb3a619c6a94be47f2f84170edaa735ce810eeba 100644 (file)
--- a/drivers/staging/slicoss/slic.h
+++ b/drivers/staging/slicoss/slic.h
@@ -527,15 +527,6 @@ struct adapter {
     (largestat) += ((newstat) - (oldstat));                              \
 }
 
-#define ETHER_EQ_ADDR(_AddrA, _AddrB, _Result)                           \
-{                                                                        \
-    _Result = true;                                                      \
-    if (*(u32 *)(_AddrA) != *(u32 *)(_AddrB))                          \
-       _Result = false;                                                 \
-    if (*(u16 *)(&((_AddrA)[4])) != *(u16 *)(&((_AddrB)[4])))        \
-       _Result = false;                                                 \
-}
-
 #if defined(CONFIG_X86_64) || defined(CONFIG_IA64)
 #define   SLIC_GET_ADDR_LOW(_addr)  (u32)((u64)(_addr) & \
        0x00000000FFFFFFFF)

diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 4dbd5aa2d9805c3c52fe732e7c596ba9233147b9..aefe3fef7728b7fdbcae77dcf826689cf25c20f8 100644 (file)
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -1249,13 +1249,11 @@ static struct net_device_stats *slic_get_stats(struct net_device *dev)
 static int slic_mcast_add_list(struct adapter *adapter, char *address)
 {
        struct mcast_address *mcaddr, *mlist;
-       bool equaladdr;
 
        /* Check to see if it already exists */
        mlist = adapter->mcastaddrs;
        while (mlist) {
-               ETHER_EQ_ADDR(mlist->address, address, equaladdr);
-               if (equaladdr)
+               if (!compare_ether_addr(mlist->address, address))
                        return STATUS_SUCCESS;
                mlist = mlist->next;
        }
@@ -2469,7 +2467,6 @@ static bool slic_mac_filter(struct adapter *adapter,
        u32 opts = adapter->macopts;
        u32 *dhost4 = (u32 *)&ether_frame->ether_dhost[0];
        u16 *dhost2 = (u16 *)&ether_frame->ether_dhost[4];
-       bool equaladdr;
 
        if (opts & MAC_PROMISC)
                return true;
@@ -2493,10 +2490,8 @@ static bool slic_mac_filter(struct adapter *adapter,
                        struct mcast_address *mcaddr = adapter->mcastaddrs;
 
                        while (mcaddr) {
-                               ETHER_EQ_ADDR(mcaddr->address,
-                                             ether_frame->ether_dhost,
-                                             equaladdr);
-                               if (equaladdr) {
+                               if (!compare_ether_addr(mcaddr->address,
+                                                       ether_frame->ether_dhost)) {
                                        adapter->rcv_multicasts++;
                                        adapter->stats.multicast++;
                                        return true;