From 42276f9c62e4cf960a7e6494026e4c25149ed4ad Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Date: Fri, 17 Mar 2006 16:05:43 -0800
Subject: [PATCH] --- yaml --- r: 21089 b: refs/heads/master c:
 265a92856b17524c87da0258ac0d3cec80ae1d35 h: refs/heads/master i:   21087:
 208165a7b24e90e1a77f91bc3bcccb0fd8993b9f v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/sock.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9702622640cf..a54020f949d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f5e6b9e69bf043074a0edabe3d271899c34eb79
+refs/heads/master: 265a92856b17524c87da0258ac0d3cec80ae1d35
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index 30758035d616..f63d0d56712c 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -478,9 +478,9 @@ static inline void sk_add_backlog(struct sock *sk, struct sk_buff *skb)
 	rc = __condition;					\
 	if (!rc) {						\
 		*(__timeo) = schedule_timeout(*(__timeo));	\
-		rc = __condition;				\
 	}							\
 	lock_sock(__sk);					\
+	rc = __condition;					\
 	rc;							\
 })