From 0aeeeb5dd5a254b7f6388573697e1a8fbd4e8d8d Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Fri, 14 Jul 2006 16:34:22 -0700
Subject: [PATCH] --- yaml --- r: 32681 b: refs/heads/master c:
 0610d11b53ad15200618e38e4511373e3ed09e8a h: refs/heads/master i:   32679:
 df66419e57a8e0ff5e659fa6f129165bec505c87 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/if_vlan.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index addeb9a3d3ad..39d9b588ecb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3a6251915df9e3d80d4a0d32bd8d24223906688
+refs/heads/master: 0610d11b53ad15200618e38e4511373e3ed09e8a
diff --git a/trunk/include/linux/if_vlan.h b/trunk/include/linux/if_vlan.h
index eef0876d8307..383627ad328f 100644
--- a/trunk/include/linux/if_vlan.h
+++ b/trunk/include/linux/if_vlan.h
@@ -23,8 +23,8 @@ struct vlan_collection;
 struct vlan_dev_info;
 struct hlist_node;
 
-#include <linux/proc_fs.h> /* for proc_dir_entry */
 #include <linux/netdevice.h>
+#include <linux/etherdevice.h>
 
 #define VLAN_HLEN	4		/* The additional bytes (on top of the Ethernet header)
 					 * that VLAN requires.
@@ -185,7 +185,8 @@ static inline int __vlan_hwaccel_rx(struct sk_buff *skb,
 		 * 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))
+		if (!compare_ether_addr(eth_hdr(skb)->h_dest,
+				       	skb->dev->dev_addr))
 			skb->pkt_type = PACKET_HOST;
 		break;
 	};