diff options
author | David S. Miller <davem@davemloft.net> | 2009-10-07 01:43:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-07 01:43:16 -0400 |
commit | 7ecc59c1b7fd5749667fc31f8683099cbef38977 (patch) | |
tree | 560d8ce48fac50758d1af6d722bc0bb0c7de2a34 /net/core/net-sysfs.c | |
parent | bcdce7195e0eab55b37dbd53be53057f38006380 (diff) | |
parent | 1cec9727fbfd7baff2034796154be1a0297bcedd (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.c | 4 |
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, | |||
406 | const struct iw_statistics *iw; | 406 | const struct iw_statistics *iw; |
407 | ssize_t ret = -EINVAL; | 407 | ssize_t ret = -EINVAL; |
408 | 408 | ||
409 | read_lock(&dev_base_lock); | 409 | rtnl_lock(); |
410 | if (dev_isalive(dev)) { | 410 | if (dev_isalive(dev)) { |
411 | iw = get_wireless_stats(dev); | 411 | iw = get_wireless_stats(dev); |
412 | if (iw) | 412 | if (iw) |
413 | ret = (*format)(iw, buf); | 413 | ret = (*format)(iw, buf); |
414 | } | 414 | } |
415 | read_unlock(&dev_base_lock); | 415 | rtnl_unlock(); |
416 | 416 | ||
417 | return ret; | 417 | return ret; |
418 | } | 418 | } |