From 19ff0b9280b5592d0b9b666582eba375ce000f84 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Mon, 11 May 2009 16:06:36 +0200
Subject: [PATCH] --- yaml --- r: 150284 b: refs/heads/master c:
 7be69c0b9aa93ef655db4d46e5654996489d62f5 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/net/wireless/wext.c | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e8b87a354096..880b85059621 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e80cf8537ae54ec96c389055d6e9b0ef630c042d
+refs/heads/master: 7be69c0b9aa93ef655db4d46e5654996489d62f5
diff --git a/trunk/net/wireless/wext.c b/trunk/net/wireless/wext.c
index cb6a5bb85d80..dc5b47e84a3d 100644
--- a/trunk/net/wireless/wext.c
+++ b/trunk/net/wireless/wext.c
@@ -649,14 +649,28 @@ static int wireless_seq_show(struct seq_file *seq, void *v)
 	return 0;
 }
 
+static void *wireless_dev_seq_start(struct seq_file *seq, loff_t *pos)
+	__acquires(dev_base_lock)
+{
+	rtnl_lock();
+	return dev_seq_start(seq, pos);
+}
+
+static void wireless_dev_seq_stop(struct seq_file *seq, void *v)
+	__releases(dev_base_lock)
+{
+	dev_seq_stop(seq, v);
+	rtnl_unlock();
+}
+
 static const struct seq_operations wireless_seq_ops = {
-	.start = dev_seq_start,
+	.start = wireless_dev_seq_start,
 	.next  = dev_seq_next,
-	.stop  = dev_seq_stop,
+	.stop  = wireless_dev_seq_stop,
 	.show  = wireless_seq_show,
 };
 
-static int wireless_seq_open(struct inode *inode, struct file *file)
+static int seq_open_wireless(struct inode *inode, struct file *file)
 {
 	return seq_open_net(inode, file, &wireless_seq_ops,
 			    sizeof(struct seq_net_private));
@@ -664,7 +678,7 @@ static int wireless_seq_open(struct inode *inode, struct file *file)
 
 static const struct file_operations wireless_seq_fops = {
 	.owner	 = THIS_MODULE,
-	.open    = wireless_seq_open,
+	.open    = seq_open_wireless,
 	.read    = seq_read,
 	.llseek  = seq_lseek,
 	.release = seq_release_net,