diff options
author | andrew hendry <andrew.hendry@gmail.com> | 2010-09-14 09:32:03 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-14 23:39:09 -0400 |
commit | 21a4591794c82c1a73f9d45d6400f878648261e3 (patch) | |
tree | 623d81288e16731f0a459f61962e3ad65b77a10e /net/x25 | |
parent | 141646ce56735cedb2336b3cd21364287f0aa4c7 (diff) |
X.25 remove bkl in connect
Connect already has socket locking.
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/x25')
-rw-r--r-- | net/x25/af_x25.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 04321eec65e1..c1bbf9ec71f4 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c | |||
@@ -751,7 +751,6 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr, | |||
751 | struct x25_route *rt; | 751 | struct x25_route *rt; |
752 | int rc = 0; | 752 | int rc = 0; |
753 | 753 | ||
754 | lock_kernel(); | ||
755 | lock_sock(sk); | 754 | lock_sock(sk); |
756 | if (sk->sk_state == TCP_ESTABLISHED && sock->state == SS_CONNECTING) { | 755 | if (sk->sk_state == TCP_ESTABLISHED && sock->state == SS_CONNECTING) { |
757 | sock->state = SS_CONNECTED; | 756 | sock->state = SS_CONNECTED; |
@@ -829,7 +828,6 @@ out_put_route: | |||
829 | x25_route_put(rt); | 828 | x25_route_put(rt); |
830 | out: | 829 | out: |
831 | release_sock(sk); | 830 | release_sock(sk); |
832 | unlock_kernel(); | ||
833 | return rc; | 831 | return rc; |
834 | } | 832 | } |
835 | 833 | ||