diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2010-02-19 13:23:47 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-15 08:49:38 -0700 |
| commit | 9c42239c50d46364aecf2d5b6a927464a52e2723 (patch) | |
| tree | b69ec72bd85c69e706dcfae7a1dddc352898fc7d /net | |
| parent | 7ee8af9de5b806144734e2bfbbd9eccf5aecb374 (diff) | |
net-sysfs: Use rtnl_trylock in wireless sysfs methods.
[ Upstream commit b8afe6416101549e877f8470f2a160df69676166 ]
The wireless sysfs methods like the rest of the networking sysfs
methods are removed with the rtnl_lock held and block until
the existing methods stop executing. So use rtnl_trylock
and restart_syscall so that the code continues to work.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
| -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 427ded84122..d5617d45dee 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -366,7 +366,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) |