diff options
| author | David S. Miller | 2010-02-26 08:22:42 +0100 |
|---|---|---|
| committer | David S. Miller | 2010-02-26 08:22:42 +0100 |
| commit | 04488734806948624dabc4514f96f14cd75b9a50 (patch) | |
| tree | 74f3a3c10a7177a5f86398b83ad7bf0569fe8b89 /net/core | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/... (diff) | |
| parent | net: bug fix for vlan + gro issue (diff) | |
| download | kernel-qcow2-linux-04488734806948624dabc4514f96f14cd75b9a50.tar.gz kernel-qcow2-linux-04488734806948624dabc4514f96f14cd75b9a50.tar.xz kernel-qcow2-linux-04488734806948624dabc4514f96f14cd75b9a50.zip | |
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, const struct iw_statistics *iw; ssize_t ret = -EINVAL; - rtnl_lock(); + if (!rtnl_trylock()) + return restart_syscall(); if (dev_isalive(dev)) { iw = get_wireless_stats(dev); if (iw) |