From 9769b7428accb1a23148f9b505e0a357126ecf04 Mon Sep 17 00:00:00 2001
From: Sasha Levin <levinsasha928@gmail.com>
Date: Wed, 2 May 2012 03:58:43 +0000
Subject: [PATCH] --- yaml --- r: 300002 b: refs/heads/master c:
 84768edbb2721637620b2d84501bb0d5aed603f1 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/l2tp/l2tp_ip.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 87f38ae85850..909fc2cb8fb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fdcfa12843bca38d0c9deff70c8720e4e8f515f
+refs/heads/master: 84768edbb2721637620b2d84501bb0d5aed603f1
diff --git a/trunk/net/l2tp/l2tp_ip.c b/trunk/net/l2tp/l2tp_ip.c
index 585d93ecee2d..6274f0be82b0 100644
--- a/trunk/net/l2tp/l2tp_ip.c
+++ b/trunk/net/l2tp/l2tp_ip.c
@@ -442,8 +442,9 @@ static int l2tp_ip_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m
 
 		daddr = lip->l2tp_addr.s_addr;
 	} else {
+		rc = -EDESTADDRREQ;
 		if (sk->sk_state != TCP_ESTABLISHED)
-			return -EDESTADDRREQ;
+			goto out;
 
 		daddr = inet->inet_daddr;
 		connected = 1;