---

yaml --- r: 180676 b: refs/heads/master c: b8afe64 h: refs/heads/master v: v3
git-mirror · Feb 19, 2010 · 56cea29 · 56cea29
1 parent 51a3e82
commit 56cea29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88af182e389097997c5e2a0b42285b3522796759
+refs/heads/master: b8afe6416101549e877f8470f2a160df69676166
diff --git a/trunk/net/core/net-sysfs.c b/trunk/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)