diff options
| author | andrew hendry <andrew.hendry@gmail.com> | 2010-09-21 11:24:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-22 16:35:51 -0400 |
| commit | 40e192c3ff7b1af680b0b03e94cadf1dad5fb82e (patch) | |
| tree | ecd92e13d0ee1c11b0c453e361018cea8f270276 /net | |
| parent | 7e51b439f147670c4ddd2bf6ca4567592b5312de (diff) | |
X.25 remove bkl in getsockname
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 | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index c1bbf9ec71f4..dc6767ecdaf8 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c | |||
| @@ -909,7 +909,6 @@ static int x25_getname(struct socket *sock, struct sockaddr *uaddr, | |||
| 909 | struct x25_sock *x25 = x25_sk(sk); | 909 | struct x25_sock *x25 = x25_sk(sk); |
| 910 | int rc = 0; | 910 | int rc = 0; |
| 911 | 911 | ||
| 912 | lock_kernel(); | ||
| 913 | if (peer) { | 912 | if (peer) { |
| 914 | if (sk->sk_state != TCP_ESTABLISHED) { | 913 | if (sk->sk_state != TCP_ESTABLISHED) { |
| 915 | rc = -ENOTCONN; | 914 | rc = -ENOTCONN; |
| @@ -923,7 +922,6 @@ static int x25_getname(struct socket *sock, struct sockaddr *uaddr, | |||
| 923 | *uaddr_len = sizeof(*sx25); | 922 | *uaddr_len = sizeof(*sx25); |
| 924 | 923 | ||
| 925 | out: | 924 | out: |
| 926 | unlock_kernel(); | ||
| 927 | return rc; | 925 | return rc; |
| 928 | } | 926 | } |
| 929 | 927 | ||
