diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-26 02:22:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-26 02:22:42 -0500 |
| commit | 04488734806948624dabc4514f96f14cd75b9a50 (patch) | |
| tree | 74f3a3c10a7177a5f86398b83ad7bf0569fe8b89 /net/core | |
| parent | 54831a83bfe656c4c54e287c734c6b0ccaa3719b (diff) | |
| parent | c4d49794ff2838038fd9756eae39c39a5a685833 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/net-sysfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index fbc1c7472c5e..099c753c4213 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c | |||
| @@ -410,7 +410,8 @@ static ssize_t wireless_show(struct device *d, char *buf, | |||
| 410 | const struct iw_statistics *iw; | 410 | const struct iw_statistics *iw; |
| 411 | ssize_t ret = -EINVAL; | 411 | ssize_t ret = -EINVAL; |
| 412 | 412 | ||
| 413 | rtnl_lock(); | 413 | if (!rtnl_trylock()) |
| 414 | return restart_syscall(); | ||
| 414 | if (dev_isalive(dev)) { | 415 | if (dev_isalive(dev)) { |
| 415 | iw = get_wireless_stats(dev); | 416 | iw = get_wireless_stats(dev); |
| 416 | if (iw) | 417 | if (iw) |