diff options
Diffstat (limited to 'net/8021q/vlan.h')
-rw-r--r-- | net/8021q/vlan.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h index 51271aea402b..5229a72c7ea1 100644 --- a/net/8021q/vlan.h +++ b/net/8021q/vlan.h | |||
@@ -3,8 +3,6 @@ | |||
3 | 3 | ||
4 | #include <linux/if_vlan.h> | 4 | #include <linux/if_vlan.h> |
5 | 5 | ||
6 | extern unsigned short vlan_name_type; | ||
7 | |||
8 | #define VLAN_GRP_HASH_SHIFT 5 | 6 | #define VLAN_GRP_HASH_SHIFT 5 |
9 | #define VLAN_GRP_HASH_SIZE (1 << VLAN_GRP_HASH_SHIFT) | 7 | #define VLAN_GRP_HASH_SIZE (1 << VLAN_GRP_HASH_SHIFT) |
10 | #define VLAN_GRP_HASH_MASK (VLAN_GRP_HASH_SIZE - 1) | 8 | #define VLAN_GRP_HASH_MASK (VLAN_GRP_HASH_SIZE - 1) |
@@ -50,4 +48,17 @@ static inline int is_vlan_dev(struct net_device *dev) | |||
50 | return dev->priv_flags & IFF_802_1Q_VLAN; | 48 | return dev->priv_flags & IFF_802_1Q_VLAN; |
51 | } | 49 | } |
52 | 50 | ||
51 | extern int vlan_net_id; | ||
52 | |||
53 | struct proc_dir_entry; | ||
54 | |||
55 | struct vlan_net { | ||
56 | /* /proc/net/vlan */ | ||
57 | struct proc_dir_entry *proc_vlan_dir; | ||
58 | /* /proc/net/vlan/config */ | ||
59 | struct proc_dir_entry *proc_vlan_conf; | ||
60 | /* Determines interface naming scheme. */ | ||
61 | unsigned short name_type; | ||
62 | }; | ||
63 | |||
53 | #endif /* !(__BEN_VLAN_802_1Q_INC__) */ | 64 | #endif /* !(__BEN_VLAN_802_1Q_INC__) */ |