Skip to content

Commit

Permalink
Bluetooth: move l2cap_sock_release() to l2cap_sock.c
Browse files Browse the repository at this point in the history
Signed-off-by: Gustavo F. Padovan <[email protected]>
  • Loading branch information
Gustavo F. Padovan committed Feb 8, 2011
1 parent 6539058 commit 554f05b
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 18 deletions.
1 change: 0 additions & 1 deletion include/net/bluetooth/l2cap.h
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,6 @@ void l2cap_sock_init(struct sock *sk, struct sock *parent);
struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock,
int proto, gfp_t prio);

int l2cap_sock_release(struct socket *sock);
int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen);
int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int alen, int flags);
int l2cap_sock_listen(struct socket *sock, int backlog);
Expand Down
17 changes: 0 additions & 17 deletions net/bluetooth/l2cap_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2159,23 +2159,6 @@ int l2cap_sock_shutdown(struct socket *sock, int how)
return err;
}

int l2cap_sock_release(struct socket *sock)
{
struct sock *sk = sock->sk;
int err;

BT_DBG("sock %p, sk %p", sock, sk);

if (!sk)
return 0;

err = l2cap_sock_shutdown(sock, 2);

sock_orphan(sk);
l2cap_sock_kill(sk);
return err;
}

static void l2cap_chan_ready(struct sock *sk)
{
struct sock *parent = bt_sk(sk)->parent;
Expand Down
17 changes: 17 additions & 0 deletions net/bluetooth/l2cap_sock.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,23 @@ static void l2cap_sock_timeout(unsigned long arg)
sock_put(sk);
}

static int l2cap_sock_release(struct socket *sock)
{
struct sock *sk = sock->sk;
int err;

BT_DBG("sock %p, sk %p", sock, sk);

if (!sk)
return 0;

err = l2cap_sock_shutdown(sock, 2);

sock_orphan(sk);
l2cap_sock_kill(sk);
return err;
}

static void l2cap_sock_destruct(struct sock *sk)
{
BT_DBG("sk %p", sk);
Expand Down

0 comments on commit 554f05b

Please sign in to comment.