From c54b5a1d0bf6e1e1b55b33ae0e6cae2360b37c31 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 16 Apr 2008 00:52:24 -0700
Subject: [PATCH] --- yaml --- r: 90751 b: refs/heads/master c:
 80de2d982156b5f6f50ff97175dc94ccfe3d093f h: refs/heads/master i:   90749:
 7c08896971fef96e16627466bc9cfb8806a48d07   90747:
 5816ae3a5a577536e2b15ce9f715920e896591e5   90743:
 7051f58593a88cd6df32e54f7a4149ba064b1372   90735:
 81fe3c54d2df4b6bc1cfb7328943244180984688   90719:
 913cc5e5f48c2fdbab9295cd999d4c029283c4ef   90687:
 a56d56a6544543bdc18034c9b3b37e6fee35dd32   90623:
 f004633da80074e02db9f6a0ac6dd7900b2d3774 v: v3

---
 [refs]                     |  2 +-
 trunk/net/8021q/vlanproc.c | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 55fcd8c02c70..1ae1a4a604e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a59a8c1c865e6d231e1b5675f767ace006f08c21
+refs/heads/master: 80de2d982156b5f6f50ff97175dc94ccfe3d093f
diff --git a/trunk/net/8021q/vlanproc.c b/trunk/net/8021q/vlanproc.c
index 995544b89071..cc17b722078a 100644
--- a/trunk/net/8021q/vlanproc.c
+++ b/trunk/net/8021q/vlanproc.c
@@ -80,7 +80,8 @@ static const struct seq_operations vlan_seq_ops = {
 
 static int vlan_seq_open(struct inode *inode, struct file *file)
 {
-	return seq_open(file, &vlan_seq_ops);
+	return seq_open_net(inode, file, &vlan_seq_ops,
+			sizeof(struct seq_net_private));
 }
 
 static const struct file_operations vlan_fops = {
@@ -88,7 +89,7 @@ static const struct file_operations vlan_fops = {
 	.open    = vlan_seq_open,
 	.read    = seq_read,
 	.llseek  = seq_lseek,
-	.release = seq_release,
+	.release = seq_release_net,
 };
 
 /*
@@ -211,6 +212,7 @@ static void *vlan_seq_start(struct seq_file *seq, loff_t *pos)
 	__acquires(dev_base_lock)
 {
 	struct net_device *dev;
+	struct net *net = seq_file_net(seq);
 	loff_t i = 1;
 
 	read_lock(&dev_base_lock);
@@ -218,7 +220,7 @@ static void *vlan_seq_start(struct seq_file *seq, loff_t *pos)
 	if (*pos == 0)
 		return SEQ_START_TOKEN;
 
-	for_each_netdev(&init_net, dev) {
+	for_each_netdev(net, dev) {
 		if (!is_vlan_dev(dev))
 			continue;
 
@@ -232,14 +234,15 @@ static void *vlan_seq_start(struct seq_file *seq, loff_t *pos)
 static void *vlan_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
 	struct net_device *dev;
+	struct net *net = seq_file_net(seq);
 
 	++*pos;
 
 	dev = (struct net_device *)v;
 	if (v == SEQ_START_TOKEN)
-		dev = net_device_entry(&init_net.dev_base_head);
+		dev = net_device_entry(&net->dev_base_head);
 
-	for_each_netdev_continue(&init_net, dev) {
+	for_each_netdev_continue(net, dev) {
 		if (!is_vlan_dev(dev))
 			continue;