diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-06-10 16:52:10 +0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-06-10 16:52:10 +0400 |
| commit | 66dd07b88a1c9d446f32253da606b87324fa620e (patch) | |
| tree | 4e0971bdd543585c7ab46716ae808a7fd82f9c35 /net/802/stp.c | |
| parent | f52c44cd27b4a0be37ef97f0466e4095ebebef3f (diff) | |
| parent | cfaf025112d3856637ff34a767ef785ef5cf2ca9 (diff) | |
| download | linux-66dd07b88a1c9d446f32253da606b87324fa620e.tar.xz | |
Merge commit 'v3.5-rc2' into next
Diffstat (limited to 'net/802/stp.c')
| -rw-r--r-- | net/802/stp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/802/stp.c b/net/802/stp.c index 15540b7323cd..2c40ba0ec116 100644 --- 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); |