summaryrefslogtreecommitdiff
path: root/net/8021q/vlan.h
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-04-16 00:54:39 -0700
committerDavid S. Miller <davem@davemloft.net>2008-04-16 00:56:18 -0700
commit7a17a2f79f54a988d08ffa33ec9e1038bffec42b (patch)
tree3d65b49a2d8b76851eb97a47c69e6481a884c8dc /net/8021q/vlan.h
parent80de2d982156b5f6f50ff97175dc94ccfe3d093f (diff)
[VLAN]: Make the vlan_name_type per-net.
This includes moving one on the struct vlan_net and s/vlan_name_type/vn->name_type/ over the code. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Acked-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan.h')
-rw-r--r--net/8021q/vlan.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h
index 7258357db84..5229a72c7ea 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)
@@ -59,6 +57,8 @@ struct vlan_net {
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__) */