diff options
| author | andrew hendry <andrew.hendry@gmail.com> | 2010-09-14 09:31:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-14 23:34:52 -0400 |
| commit | 25aa4efe4feb4150fe613169795df505c5018f2b (patch) | |
| tree | 51e1ec30fe45d8ba6c30245d5d74a121e38032c8 /net | |
| parent | 55b1804c678e679e1018671bd40b583eab124689 (diff) | |
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')
| -rw-r--r-- | net/x25/af_x25.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 5e86d4e97dce..f6a8f175b4f5 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) | |||
| 507 | struct sock *sk = sock->sk; | 507 | struct sock *sk = sock->sk; |
| 508 | int rc = -EOPNOTSUPP; | 508 | int rc = -EOPNOTSUPP; |
| 509 | 509 | ||
| 510 | lock_kernel(); | 510 | lock_sock(sk); |
| 511 | if (sk->sk_state != TCP_LISTEN) { | 511 | if (sk->sk_state != TCP_LISTEN) { |
| 512 | memset(&x25_sk(sk)->dest_addr, 0, X25_ADDR_LEN); | 512 | memset(&x25_sk(sk)->dest_addr, 0, X25_ADDR_LEN); |
| 513 | sk->sk_max_ack_backlog = backlog; | 513 | sk->sk_max_ack_backlog = backlog; |
| 514 | sk->sk_state = TCP_LISTEN; | 514 | sk->sk_state = TCP_LISTEN; |
| 515 | rc = 0; | 515 | rc = 0; |
| 516 | } | 516 | } |
| 517 | unlock_kernel(); | 517 | release_sock(sk); |
| 518 | 518 | ||
| 519 | return rc; | 519 | return rc; |
| 520 | } | 520 | } |
