Bluetooth: Add chan->ops->set_shutdown()
We need to remove all direct access of struct sock from L2CAP core. This change is pretty simple and just add a new L2CAP channel callback to do the work in the L2CAP socket side. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>wifi-calibration
parent
8d836d71e2
commit
5ec1bbe549
|
@ -555,6 +555,7 @@ struct l2cap_ops {
|
||||||
void (*ready) (struct l2cap_chan *chan);
|
void (*ready) (struct l2cap_chan *chan);
|
||||||
void (*defer) (struct l2cap_chan *chan);
|
void (*defer) (struct l2cap_chan *chan);
|
||||||
void (*resume) (struct l2cap_chan *chan);
|
void (*resume) (struct l2cap_chan *chan);
|
||||||
|
void (*set_shutdown) (struct l2cap_chan *chan);
|
||||||
long (*get_sndtimeo) (struct l2cap_chan *chan);
|
long (*get_sndtimeo) (struct l2cap_chan *chan);
|
||||||
struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
|
struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
|
||||||
unsigned long len, int nb);
|
unsigned long len, int nb);
|
||||||
|
@ -796,6 +797,10 @@ static inline void l2cap_chan_no_defer(struct l2cap_chan *chan)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline void l2cap_chan_no_set_shutdown(struct l2cap_chan *chan)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
static inline long l2cap_chan_no_get_sndtimeo(struct l2cap_chan *chan)
|
static inline long l2cap_chan_no_get_sndtimeo(struct l2cap_chan *chan)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -710,6 +710,7 @@ static struct l2cap_ops a2mp_chan_ops = {
|
||||||
.teardown = l2cap_chan_no_teardown,
|
.teardown = l2cap_chan_no_teardown,
|
||||||
.ready = l2cap_chan_no_ready,
|
.ready = l2cap_chan_no_ready,
|
||||||
.defer = l2cap_chan_no_defer,
|
.defer = l2cap_chan_no_defer,
|
||||||
|
.set_shutdown = l2cap_chan_no_set_shutdown,
|
||||||
.get_sndtimeo = l2cap_chan_no_get_sndtimeo,
|
.get_sndtimeo = l2cap_chan_no_get_sndtimeo,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -4241,7 +4241,6 @@ static inline int l2cap_disconnect_req(struct l2cap_conn *conn,
|
||||||
struct l2cap_disconn_rsp rsp;
|
struct l2cap_disconn_rsp rsp;
|
||||||
u16 dcid, scid;
|
u16 dcid, scid;
|
||||||
struct l2cap_chan *chan;
|
struct l2cap_chan *chan;
|
||||||
struct sock *sk;
|
|
||||||
|
|
||||||
if (cmd_len != sizeof(*req))
|
if (cmd_len != sizeof(*req))
|
||||||
return -EPROTO;
|
return -EPROTO;
|
||||||
|
@ -4261,15 +4260,11 @@ static inline int l2cap_disconnect_req(struct l2cap_conn *conn,
|
||||||
|
|
||||||
l2cap_chan_lock(chan);
|
l2cap_chan_lock(chan);
|
||||||
|
|
||||||
sk = chan->sk;
|
|
||||||
|
|
||||||
rsp.dcid = cpu_to_le16(chan->scid);
|
rsp.dcid = cpu_to_le16(chan->scid);
|
||||||
rsp.scid = cpu_to_le16(chan->dcid);
|
rsp.scid = cpu_to_le16(chan->dcid);
|
||||||
l2cap_send_cmd(conn, cmd->ident, L2CAP_DISCONN_RSP, sizeof(rsp), &rsp);
|
l2cap_send_cmd(conn, cmd->ident, L2CAP_DISCONN_RSP, sizeof(rsp), &rsp);
|
||||||
|
|
||||||
lock_sock(sk);
|
chan->ops->set_shutdown(chan);
|
||||||
sk->sk_shutdown = SHUTDOWN_MASK;
|
|
||||||
release_sock(sk);
|
|
||||||
|
|
||||||
l2cap_chan_hold(chan);
|
l2cap_chan_hold(chan);
|
||||||
l2cap_chan_del(chan, ECONNRESET);
|
l2cap_chan_del(chan, ECONNRESET);
|
||||||
|
|
|
@ -1136,6 +1136,15 @@ static void l2cap_sock_resume_cb(struct l2cap_chan *chan)
|
||||||
sk->sk_state_change(sk);
|
sk->sk_state_change(sk);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void l2cap_sock_set_shutdown_cb(struct l2cap_chan *chan)
|
||||||
|
{
|
||||||
|
struct sock *sk = chan->data;
|
||||||
|
|
||||||
|
lock_sock(sk);
|
||||||
|
sk->sk_shutdown = SHUTDOWN_MASK;
|
||||||
|
release_sock(sk);
|
||||||
|
}
|
||||||
|
|
||||||
static long l2cap_sock_get_sndtimeo_cb(struct l2cap_chan *chan)
|
static long l2cap_sock_get_sndtimeo_cb(struct l2cap_chan *chan)
|
||||||
{
|
{
|
||||||
struct sock *sk = chan->data;
|
struct sock *sk = chan->data;
|
||||||
|
@ -1153,6 +1162,7 @@ static struct l2cap_ops l2cap_chan_ops = {
|
||||||
.ready = l2cap_sock_ready_cb,
|
.ready = l2cap_sock_ready_cb,
|
||||||
.defer = l2cap_sock_defer_cb,
|
.defer = l2cap_sock_defer_cb,
|
||||||
.resume = l2cap_sock_resume_cb,
|
.resume = l2cap_sock_resume_cb,
|
||||||
|
.set_shutdown = l2cap_sock_set_shutdown_cb,
|
||||||
.get_sndtimeo = l2cap_sock_get_sndtimeo_cb,
|
.get_sndtimeo = l2cap_sock_get_sndtimeo_cb,
|
||||||
.alloc_skb = l2cap_sock_alloc_skb_cb,
|
.alloc_skb = l2cap_sock_alloc_skb_cb,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue