From 7a7a892ec492c033109ab29f58b3e9493bbbe25d Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Sat, 20 Apr 2013 23:51:41 +0000
Subject: [PATCH] --- yaml --- r: 369351 b: refs/heads/master c:
 9fae27b33785cb6350f21449073d9f7d1a2bbfd6 h: refs/heads/master i:   369349:
 e8557153b995ba504c3c7249a42af28e174c0ff1   369347:
 90eec76388cd36fccf94083b3aefc726c3ff11bd   369343:
 9bc9783ce84145b4c94bee1e90b665fec36d9fdd v: v3

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

diff --git a/[refs] b/[refs]
index 5ebaecbd7ef7..826edd5ad7cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf2c014adef10c75af7042f38e74adb91d7bff6c
+refs/heads/master: 9fae27b33785cb6350f21449073d9f7d1a2bbfd6
diff --git a/trunk/include/linux/if_vlan.h b/trunk/include/linux/if_vlan.h
index a78f9390da87..52bd03b38962 100644
--- a/trunk/include/linux/if_vlan.h
+++ b/trunk/include/linux/if_vlan.h
@@ -104,7 +104,8 @@ extern void vlan_vids_del_by_dev(struct net_device *dev,
 extern bool vlan_uses_dev(const struct net_device *dev);
 #else
 static inline struct net_device *
-__vlan_find_dev_deep(struct net_device *real_dev, u16 vlan_id)
+__vlan_find_dev_deep(struct net_device *real_dev,
+		     __be16 vlan_proto, u16 vlan_id)
 {
 	return NULL;
 }
@@ -131,12 +132,12 @@ static inline struct sk_buff *vlan_untag(struct sk_buff *skb)
 	return skb;
 }
 
-static inline int vlan_vid_add(struct net_device *dev, unsigned short vid)
+static inline int vlan_vid_add(struct net_device *dev, __be16 proto, u16 vid)
 {
 	return 0;
 }
 
-static inline void vlan_vid_del(struct net_device *dev, unsigned short vid)
+static inline void vlan_vid_del(struct net_device *dev, __be16 proto, u16 vid)
 {
 }