summaryrefslogtreecommitdiff
path: root/net/core/net-sysfs.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-10-06 22:43:16 -0700
committerDavid S. Miller <davem@davemloft.net>2009-10-06 22:43:16 -0700
commit7ecc59c1b7fd5749667fc31f8683099cbef38977 (patch)
tree560d8ce48fac50758d1af6d722bc0bb0c7de2a34 /net/core/net-sysfs.c
parentbcdce7195e0eab55b37dbd53be53057f38006380 (diff)
parent1cec9727fbfd7baff2034796154be1a0297bcedd (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core/net-sysfs.c')
-rw-r--r--net/core/net-sysfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index effb78410eb2..4242e94ff1a5 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -406,13 +406,13 @@ static ssize_t wireless_show(struct device *d, char *buf,
const struct iw_statistics *iw;
ssize_t ret = -EINVAL;
- read_lock(&dev_base_lock);
+ rtnl_lock();
if (dev_isalive(dev)) {
iw = get_wireless_stats(dev);
if (iw)
ret = (*format)(iw, buf);
}
- read_unlock(&dev_base_lock);
+ rtnl_unlock();
return ret;
}