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

[linux-2.6-block.git] / drivers / net / ethernet / rocker / rocker.c

diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index ec251531bd9f8ecd1e64295b4f1f5c35fe475b79..0c6f0a8b42ddcb542b17aeb2904fb9ed9c17f3a1 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -2500,7 +2500,7 @@ static int rocker_flow_tbl_bridge(struct rocker_port *rocker_port,
        if (eth_dst_mask) {
                entry->key.bridge.has_eth_dst_mask = 1;
                ether_addr_copy(entry->key.bridge.eth_dst_mask, eth_dst_mask);
-               if (memcmp(eth_dst_mask, ff_mac, ETH_ALEN))
+               if (!ether_addr_equal(eth_dst_mask, ff_mac))
                        wild = true;
        }
 
@@ -2573,7 +2573,7 @@ static int rocker_flow_tbl_acl(struct rocker_port *rocker_port,
 
        priority = ROCKER_PRIORITY_ACL_NORMAL;
        if (eth_dst && eth_dst_mask) {
-               if (memcmp(eth_dst_mask, mcast_mac, ETH_ALEN) == 0)
+               if (ether_addr_equal(eth_dst_mask, mcast_mac))
                        priority = ROCKER_PRIORITY_ACL_DFLT;
                else if (is_link_local_ether_addr(eth_dst))
                        priority = ROCKER_PRIORITY_ACL_CTRL;