diff options
| author | Linus Torvalds <[email protected]> | 2006-01-10 13:44:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2006-01-10 13:44:43 -0800 |
| commit | 58dc125a66145f45f239cd78db9410062dc0bcd4 (patch) | |
| tree | 90537ddf035e96ca3182f61755ed234de93b449b /net/8021q/vlan_dev.c | |
| parent | c544bdb1999e04eb10035f1c3262a103859d94b2 (diff) | |
| parent | 8a4c8a96a47c9e2f08156fd9664974df086eed50 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/8021q/vlan_dev.c')
| -rw-r--r-- | net/8021q/vlan_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index f2a8750bbf1d..0f604d227da2 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -214,7 +214,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, * This allows the VLAN to have a different MAC than the underlying * device, and still route correctly. */ - if (memcmp(eth_hdr(skb)->h_dest, skb->dev->dev_addr, ETH_ALEN) == 0) { + if (!compare_ether_addr(eth_hdr(skb)->h_dest, skb->dev->dev_addr)) { /* It is for our (changed) MAC-address! */ skb->pkt_type = PACKET_HOST; } |