diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-19 19:34:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-19 19:34:56 -0800 |
| commit | 8386cda3f9faadcdcf0205ab6b84b03ce4ee1f6f (patch) | |
| tree | 8f7be8e77f9915bc0a276f1263674ad8448415ee /net/core/net-sysfs.c | |
| parent | 83bdd240eeb388a611b2bdbed9afdb3192966cec (diff) | |
| parent | 242cc0547f3bcecc0b02ca6f3e9512760185727e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
sfc: SFE4002/SFN4112F: Widen temperature and voltage tolerances
sfc: Fix sign of efx_mcdi_poll_reboot() error in efx_mcdi_poll()
net-sysfs: Use rtnl_trylock in wireless sysfs methods.
net: Fix sysctl restarts...
Diffstat (limited to 'net/core/net-sysfs.c')
| -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 fbc1c7472c5..099c753c421 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) |