diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-05-09 21:12:37 -0700 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-05-09 21:12:37 -0700 |
| commit | 958a7586814e3498dbb2124de195982163af6bbc (patch) | |
| tree | d8a23fc9414b5ce994bd23426844a56afecb3fc5 /net/bridge/br_input.c | |
| parent | eeb0d0132d7a5f0ca149d1c6d6aeeafa19a98594 (diff) | |
| parent | 8feedbb4a710784d2858acba5c90e903e93e36eb (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Diffstat (limited to 'net/bridge/br_input.c')
| -rw-r--r-- | net/bridge/br_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index 5a31731be4d..76f15fda021 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -216,7 +216,7 @@ forward: } /* fall through */ case BR_STATE_LEARNING: - if (!compare_ether_addr(p->br->dev->dev_addr, dest)) + if (ether_addr_equal(p->br->dev->dev_addr, dest)) skb->pkt_type = PACKET_HOST; NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, |