X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2F8021q%2Fvlan.h;h=5229a72c7ea15ed421f6649ac55b5e66da5a9c28;hb=b4ba0ba24b57ec975482f4ba2d350fbee7557240;hp=51271aea402be83dfc7e7e048dd2285b5f11bf96;hpb=6fdf5e67fe8d3c83500dad9acae985132c2459a3;p=linux-2.6

diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h
index 51271aea40..5229a72c7e 100644
--- a/net/8021q/vlan.h
+++ b/net/8021q/vlan.h
@@ -3,8 +3,6 @@
 
 #include <linux/if_vlan.h>
 
-extern unsigned short vlan_name_type;
-
 #define VLAN_GRP_HASH_SHIFT	5
 #define VLAN_GRP_HASH_SIZE	(1 << VLAN_GRP_HASH_SHIFT)
 #define VLAN_GRP_HASH_MASK	(VLAN_GRP_HASH_SIZE - 1)
@@ -50,4 +48,17 @@ 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;
+
+struct vlan_net {
+	/* /proc/net/vlan */
+	struct proc_dir_entry *proc_vlan_dir;
+	/* /proc/net/vlan/config */
+	struct proc_dir_entry *proc_vlan_conf;
+	/* Determines interface naming scheme. */
+	unsigned short name_type;
+};
+
 #endif /* !(__BEN_VLAN_802_1Q_INC__) */