diff options
| author | Gustavo F. Padovan | 2011-05-02 23:25:01 +0200 |
|---|---|---|
| committer | Gustavo F. Padovan | 2011-06-08 21:58:16 +0200 |
| commit | ab07801d28985090ac38047b5a4d8952a7e1689f (patch) | |
| tree | 9ae945f55141b32b779c6a5969806725b39c09c3 /include | |
| parent | Bluetooth: Add chan->chan_type struct member (diff) | |
| download | kernel-qcow2-linux-ab07801d28985090ac38047b5a4d8952a7e1689f.tar.gz kernel-qcow2-linux-ab07801d28985090ac38047b5a4d8952a7e1689f.tar.xz kernel-qcow2-linux-ab07801d28985090ac38047b5a4d8952a7e1689f.zip | |
Bluetooth: create channel timer to replace sk_timer
The new timer does not belong to struct sock, tought it still touch some
sock things, but this will be sorted out soon.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bluetooth/l2cap.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 094a7ac16ffe..efb1fc4f3a03 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -340,6 +340,7 @@ struct l2cap_chan { __u8 remote_max_tx; __u16 remote_mps; + struct timer_list chan_timer; struct timer_list retrans_timer; struct timer_list monitor_timer; struct timer_list ack_timer; @@ -457,12 +458,12 @@ int __l2cap_wait_ack(struct sock *sk); int l2cap_add_psm(struct l2cap_chan *chan, bdaddr_t *src, __le16 psm); int l2cap_add_scid(struct l2cap_chan *chan, __u16 scid); -void l2cap_sock_set_timer(struct sock *sk, long timeout); -void l2cap_sock_clear_timer(struct sock *sk); void l2cap_sock_kill(struct sock *sk); 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); + +void l2cap_chan_clear_timer(struct l2cap_chan *chan); struct l2cap_chan *l2cap_chan_create(struct sock *sk); void __l2cap_chan_close(struct l2cap_chan *chan, int reason); void l2cap_chan_destroy(struct l2cap_chan *chan); |