diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2008-04-16 00:54:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-16 00:56:18 -0700 |
| commit | 7a17a2f79f54a988d08ffa33ec9e1038bffec42b (patch) | |
| tree | 3d65b49a2d8b76851eb97a47c69e6481a884c8dc /net/8021q/vlanproc.c | |
| parent | 80de2d982156b5f6f50ff97175dc94ccfe3d093f (diff) | |
| download | op-kernel-dev-7a17a2f79f54a988d08ffa33ec9e1038bffec42b.zip op-kernel-dev-7a17a2f79f54a988d08ffa33ec9e1038bffec42b.tar.gz | |
[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/vlanproc.c')
| -rw-r--r-- | net/8021q/vlanproc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c index cc17b72..daad006 100644 --- a/net/8021q/vlanproc.c +++ b/net/8021q/vlanproc.c @@ -260,13 +260,16 @@ static void vlan_seq_stop(struct seq_file *seq, void *v) static int vlan_seq_show(struct seq_file *seq, void *v) { + struct net *net = seq_file_net(seq); + struct vlan_net *vn = net_generic(net, vlan_net_id); + if (v == SEQ_START_TOKEN) { const char *nmtype = NULL; seq_puts(seq, "VLAN Dev name | VLAN ID\n"); - if (vlan_name_type < ARRAY_SIZE(vlan_name_type_str)) - nmtype = vlan_name_type_str[vlan_name_type]; + if (vn->name_type < ARRAY_SIZE(vlan_name_type_str)) + nmtype = vlan_name_type_str[vn->name_type]; seq_printf(seq, "Name-Type: %s\n", nmtype ? nmtype : "UNKNOWN"); |
