summaryrefslogtreecommitdiff
path: root/net/x25
diff options
context:
space:
mode:
authorandrew hendry <andrew.hendry@gmail.com>2010-09-14 13:31:16 +0000
committerDavid S. Miller <davem@davemloft.net>2010-09-14 20:34:52 -0700
commit25aa4efe4feb4150fe613169795df505c5018f2b (patch)
tree51e1ec30fe45d8ba6c30245d5d74a121e38032c8 /net/x25
parent55b1804c678e679e1018671bd40b583eab124689 (diff)
downloadlinux-3.10-25aa4efe4feb4150fe613169795df505c5018f2b.tar.gz
linux-3.10-25aa4efe4feb4150fe613169795df505c5018f2b.tar.bz2
linux-3.10-25aa4efe4feb4150fe613169795df505c5018f2b.zip
X.25 remove bkl in listen
Listen updates socket values and needs lock_sock. 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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 5e86d4e97dc..f6a8f175b4f 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -507,14 +507,14 @@ static int x25_listen(struct socket *sock, int backlog)
struct sock *sk = sock->sk;
int rc = -EOPNOTSUPP;
- lock_kernel();
+ lock_sock(sk);
if (sk->sk_state != TCP_LISTEN) {
memset(&x25_sk(sk)->dest_addr, 0, X25_ADDR_LEN);
sk->sk_max_ack_backlog = backlog;
sk->sk_state = TCP_LISTEN;
rc = 0;
}
- unlock_kernel();
+ release_sock(sk);
return rc;
}