Merge branch 'master'

1 files changed, 1 insertions, 1 deletions

diff --git a/include/net/sock.h b/include/net/sock.h
index 30758035d616..f63d0d56712c 100644
--- a/include/net/sock.h
+++ b/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;                                                     \
 })