Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

[karo-tx-linux.git] / net / 802 / stp.c

diff --git a/net/802/stp.c b/net/802/stp.c
index 15540b7323cde090b76f0d52a33e7ef69bfa05d3..2c40ba0ec1160be6853aa6a01bff69965aace660 100644 (file)
--- a/net/802/stp.c
+++ b/net/802/stp.c
@@ -46,7 +46,7 @@ static int stp_pdu_rcv(struct sk_buff *skb, struct net_device *dev,
                proto = rcu_dereference(garp_protos[eh->h_dest[5] -
                                                    GARP_ADDR_MIN]);
                if (proto &&
-                   compare_ether_addr(eh->h_dest, proto->group_address))
+                   !ether_addr_equal(eh->h_dest, proto->group_address))
                        goto err;
        } else
                proto = rcu_dereference(stp_proto);