aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2011-02-04 00:08:36 -0500
committerGustavo F. Padovan <padovan@profusion.mobi>2011-02-07 22:43:31 -0500
commitdcba0dba54b566a08376f93cab35cdabd6abda20 (patch)
treeb56d1c1694723e2e7c138cfa763c885b6c14eda2 /include
parent6898325923f9571fbede3372dc490faa43b3258a (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 'include')
-rw-r--r--include/net/bluetooth/l2cap.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 336b2af758b3..c9df0ef5b6f5 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -434,8 +434,10 @@ void l2cap_cleanup_sockets(void);
434u8 l2cap_get_ident(struct l2cap_conn *conn); 434u8 l2cap_get_ident(struct l2cap_conn *conn);
435void l2cap_send_cmd(struct l2cap_conn *conn, u8 ident, u8 code, u16 len, void *data); 435void l2cap_send_cmd(struct l2cap_conn *conn, u8 ident, u8 code, u16 len, void *data);
436int l2cap_build_conf_req(struct sock *sk, void *data); 436int l2cap_build_conf_req(struct sock *sk, void *data);
437int __l2cap_wait_ack(struct sock *sk);
437 438
438void l2cap_sock_set_timer(struct sock *sk, long timeout); 439void l2cap_sock_set_timer(struct sock *sk, long timeout);
440void l2cap_sock_clear_timer(struct sock *sk);
439void __l2cap_sock_close(struct sock *sk, int reason); 441void __l2cap_sock_close(struct sock *sk, int reason);
440void l2cap_sock_kill(struct sock *sk); 442void l2cap_sock_kill(struct sock *sk);
441void l2cap_sock_init(struct sock *sk, struct sock *parent); 443void l2cap_sock_init(struct sock *sk, struct sock *parent);
@@ -444,7 +446,6 @@ struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock,
444int l2cap_do_connect(struct sock *sk); 446int l2cap_do_connect(struct sock *sk);
445 447
446int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len); 448int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len);
447int l2cap_sock_shutdown(struct socket *sock, int how);
448 449
449 450
450void l2cap_load(void); 451void l2cap_load(void);