diff --git a/[refs] b/[refs] index 5a8ad8b5c3ee..3cf245cfce54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 141646ce56735cedb2336b3cd21364287f0aa4c7 +refs/heads/master: 21a4591794c82c1a73f9d45d6400f878648261e3 diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c index 04321eec65e1..c1bbf9ec71f4 100644 --- a/trunk/net/x25/af_x25.c +++ b/trunk/net/x25/af_x25.c @@ -751,7 +751,6 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr, struct x25_route *rt; int rc = 0; - lock_kernel(); lock_sock(sk); if (sk->sk_state == TCP_ESTABLISHED && sock->state == SS_CONNECTING) { sock->state = SS_CONNECTED; @@ -829,7 +828,6 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr, x25_route_put(rt); out: release_sock(sk); - unlock_kernel(); return rc; }