---

yaml --- r: 171184 b: refs/heads/master c: 000ba2e h: refs/heads/master v: v3
git-mirror · Nov 6, 2009 · a04a849 · a04a849
1 parent 34ea432
commit a04a849
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: baac8564547ac7f944af1c2e8cc6fdd57f2836a4
+refs/heads/master: 000ba2e43f33901859fd794bb33c885909d53b3b
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
@@ -417,9 +417,8 @@ static int sock_bindtodevice(struct sock *sk, char __user *optval, int optlen)
 	if (copy_from_user(devname, optval, optlen))
 		goto out;
 
-	if (devname[0] == '\0') {
-		index = 0;
-	} else {
+	index = 0;
+	if (devname[0] != '\0') {
 		struct net_device *dev;
 
 		rcu_read_lock();