---

yaml --- r: 251651 b: refs/heads/master c: 6dcbbe2 h: refs/heads/master i: 251649: 5b6c274 251647: 810ff78 v: v3
git-mirror · May 25, 2011 · e40cdf0 · e40cdf0
1 parent 09036c5
commit e40cdf0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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;