From 734ac6e32d51a16f448659e46b5f9036563e9139 Mon Sep 17 00:00:00 2001
From: Florian Zumbiehl <florz@florz.de>
Date: Mon, 30 Jul 2007 17:49:13 -0700
Subject: [PATCH] --- yaml --- r: 63413 b: refs/heads/master c:
 8aeca8fea5f2de2563e097829d62af30ca2de650 h: refs/heads/master i:   63411:
 d82f59fde75333baf7d68cbc2312b413ee4e9a6b v: v3

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

diff --git a/[refs] b/[refs]
index dc80c1497963..165e853d6b32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86c1dcfc96a778433ebc6e9b1d3e80a126cb80f2
+refs/heads/master: 8aeca8fea5f2de2563e097829d62af30ca2de650
diff --git a/trunk/drivers/net/pppoe.c b/trunk/drivers/net/pppoe.c
index f75aeaaf861f..35a7385ccb2a 100644
--- a/trunk/drivers/net/pppoe.c
+++ b/trunk/drivers/net/pppoe.c
@@ -774,6 +774,7 @@ static int pppoe_sendmsg(struct kiocb *iocb, struct socket *sock,
 	struct net_device *dev;
 	char *start;
 
+	lock_sock(sk);
 	if (sock_flag(sk, SOCK_DEAD) || !(sk->sk_state & PPPOX_CONNECTED)) {
 		error = -ENOTCONN;
 		goto end;
@@ -784,8 +785,6 @@ static int pppoe_sendmsg(struct kiocb *iocb, struct socket *sock,
 	hdr.code = 0;
 	hdr.sid = po->num;
 
-	lock_sock(sk);
-
 	dev = po->pppoe_dev;
 
 	error = -EMSGSIZE;