diff options
| author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-10-15 19:24:47 -0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2013-10-15 16:42:44 -0700 |
| commit | 8d836d71e2223b8961b21112bb4ce89ef8231682 (patch) | |
| tree | b7f6c82cf7a2b1fabbda72e1af060b3a06d71cb7 /net/bluetooth/l2cap_sock.c | |
| parent | f8e73017c15b007bd519d0049305bb377e8cc1f5 (diff) | |
| download | linux-8d836d71e2223b8961b21112bb4ce89ef8231682.tar.gz linux-8d836d71e2223b8961b21112bb4ce89ef8231682.tar.bz2 linux-8d836d71e2223b8961b21112bb4ce89ef8231682.zip | |
Bluetooth: Access sk_sndtimeo indirectly in l2cap_core.c
As part of the work to remove struct sock from l2cap_core.c and make it
more generic we remove in this commit the direct access to sk->sk_sndtimeo
member. This objective of this change is purely remove sk usage from
l2cap_core.c
Now we have a new l2cap ops to get the current value of sk->sndtimeo. A
l2cap_chan_no_get_sndtimeo was added for users of L2CAP that doesn't need
to set a timeout.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 0de8a30c06a1..ffa78d3cd8ac 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -1136,6 +1136,13 @@ static void l2cap_sock_resume_cb(struct l2cap_chan *chan) sk->sk_state_change(sk); } +static long l2cap_sock_get_sndtimeo_cb(struct l2cap_chan *chan) +{ + struct sock *sk = chan->data; + + return sk->sk_sndtimeo; +} + static struct l2cap_ops l2cap_chan_ops = { .name = "L2CAP Socket Interface", .new_connection = l2cap_sock_new_connection_cb, @@ -1146,6 +1153,7 @@ static struct l2cap_ops l2cap_chan_ops = { .ready = l2cap_sock_ready_cb, .defer = l2cap_sock_defer_cb, .resume = l2cap_sock_resume_cb, + .get_sndtimeo = l2cap_sock_get_sndtimeo_cb, .alloc_skb = l2cap_sock_alloc_skb_cb, }; |