From e40cdf0914b4ecd29cbc16abfc7cc576b3bc1f99 Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@tuxdriver.com>
Date: Tue, 24 May 2011 08:31:08 +0000
Subject: [PATCH] --- yaml --- r: 251651 b: refs/heads/master c:
 6dcbbe25dcc9bd2bdeb4f685f8fb874ffc10e6be h: refs/heads/master i:   251649:
 5b6c27423b18258095e91fcafba64724044363ce   251647:
 810ff7812b9c683cf4597d22234ce801675a5395 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/if_vlan.h | 5 +++++
 trunk/net/8021q/vlan.h        | 5 -----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 96ed71199f02..6a2fe5aa60ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22e95ac87d62bdc65b8a694a23cd4a364689b013
+refs/heads/master: 6dcbbe25dcc9bd2bdeb4f685f8fb874ffc10e6be
diff --git a/trunk/include/linux/if_vlan.h b/trunk/include/linux/if_vlan.h
index 290bd8ac94cf..dc01681fbb42 100644
--- a/trunk/include/linux/if_vlan.h
+++ b/trunk/include/linux/if_vlan.h
@@ -110,6 +110,11 @@ static inline void vlan_group_set_device(struct vlan_group *vg,
 	array[vlan_id % VLAN_GROUP_ARRAY_PART_LEN] = dev;
 }
 
+static inline int is_vlan_dev(struct net_device *dev)
+{
+        return dev->priv_flags & IFF_802_1Q_VLAN;
+}
+
 #define vlan_tx_tag_present(__skb)	((__skb)->vlan_tci & VLAN_TAG_PRESENT)
 #define vlan_tx_tag_get(__skb)		((__skb)->vlan_tci & ~VLAN_TAG_PRESENT)
 
diff --git a/trunk/net/8021q/vlan.h b/trunk/net/8021q/vlan.h
index c3408def8a19..9da07e30d1a2 100644
--- a/trunk/net/8021q/vlan.h
+++ b/trunk/net/8021q/vlan.h
@@ -118,11 +118,6 @@ extern void vlan_netlink_fini(void);
 
 extern struct rtnl_link_ops vlan_link_ops;
 
-static inline int is_vlan_dev(struct net_device *dev)
-{
-	return dev->priv_flags & IFF_802_1Q_VLAN;
-}
-
 extern int vlan_net_id;
 
 struct proc_dir_entry;