diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-02-04 00:08:36 -0500 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-02-07 22:43:31 -0500 |
| commit | dcba0dba54b566a08376f93cab35cdabd6abda20 (patch) | |
| tree | b56d1c1694723e2e7c138cfa763c885b6c14eda2 /net/bluetooth/l2cap_sock.c | |
| parent | 6898325923f9571fbede3372dc490faa43b3258a (diff) | |
Bluetooth: move l2cap_sock_shutdown() to l2cap_sock.c
Declare __l2cap_wait_ack() and l2cap_sock_clear_timer() in l2cap.h
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index fa2bc5d85560..93af233bb167 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c | |||
| @@ -723,6 +723,37 @@ static int l2cap_sock_recvmsg(struct kiocb *iocb, struct socket *sock, struct ms | |||
| 723 | return bt_sock_recvmsg(iocb, sock, msg, len, flags); | 723 | return bt_sock_recvmsg(iocb, sock, msg, len, flags); |
| 724 | } | 724 | } |
| 725 | 725 | ||
| 726 | static int l2cap_sock_shutdown(struct socket *sock, int how) | ||
| 727 | { | ||
| 728 | struct sock *sk = sock->sk; | ||
| 729 | int err = 0; | ||
| 730 | |||
| 731 | BT_DBG("sock %p, sk %p", sock, sk); | ||
| 732 | |||
| 733 | if (!sk) | ||
| 734 | return 0; | ||
| 735 | |||
| 736 | lock_sock(sk); | ||
| 737 | if (!sk->sk_shutdown) { | ||
| 738 | if (l2cap_pi(sk)->mode == L2CAP_MODE_ERTM) | ||
| 739 | err = __l2cap_wait_ack(sk); | ||
| 740 | |||
| 741 | sk->sk_shutdown = SHUTDOWN_MASK; | ||
| 742 | l2cap_sock_clear_timer(sk); | ||
| 743 | __l2cap_sock_close(sk, 0); | ||
| 744 | |||
| 745 | if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime) | ||
| 746 | err = bt_sock_wait_state(sk, BT_CLOSED, | ||
| 747 | sk->sk_lingertime); | ||
| 748 | } | ||
| 749 | |||
| 750 | if (!err && sk->sk_err) | ||
| 751 | err = -sk->sk_err; | ||
| 752 | |||
| 753 | release_sock(sk); | ||
| 754 | return err; | ||
| 755 | } | ||
| 756 | |||
| 726 | static int l2cap_sock_release(struct socket *sock) | 757 | static int l2cap_sock_release(struct socket *sock) |
| 727 | { | 758 | { |
| 728 | struct sock *sk = sock->sk; | 759 | struct sock *sk = sock->sk; |