Bluetooth: Add l2cap_chan->ops->ready() (54a59aa2) · Commits · 戴 / test

include/net/bluetooth/l2cap.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -534,6 +534,7 @@ struct l2cap_ops {
		void (close) (struct l2cap_chan chan);
		void (state_change) (struct l2cap_chan chan,
		int state);
		void (ready) (struct l2cap_chan chan);
		struct sk_buff (alloc_skb) (struct l2cap_chan *chan,
		unsigned long len, int nb);
		};

+3 −15

Original line number	Diff line number	Diff line
		@@ -931,26 +931,14 @@ static void l2cap_send_conn_req(struct l2cap_chan *chan)

		static void l2cap_chan_ready(struct l2cap_chan *chan)
		{
		struct sock *sk = chan->sk;
		struct sock *parent;

		lock_sock(sk);

		parent = bt_sk(sk)->parent;

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

		/* This clears all conf flags, including CONF_NOT_COMPLETE */
		chan->conf_state = 0;
		__clear_chan_timer(chan);

		__l2cap_state_change(chan, BT_CONNECTED);
		sk->sk_state_change(sk);

		if (parent)
		parent->sk_data_ready(parent, 0);
		chan->state = BT_CONNECTED;

		release_sock(sk);
		if (chan->ops->ready)
		chan->ops->ready(chan);
		}

		static void l2cap_do_start(struct l2cap_chan *chan)

+21 −0

Original line number	Diff line number	Diff line
		@@ -1014,6 +1014,26 @@ static struct sk_buff l2cap_sock_alloc_skb_cb(struct l2cap_chan chan,
		return skb;
		}

		static void l2cap_sock_ready_cb(struct l2cap_chan *chan)
		{
		struct sock *sk = chan->data;
		struct sock *parent;

		lock_sock(sk);

		parent = bt_sk(sk)->parent;

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

		sk->sk_state = BT_CONNECTED;
		sk->sk_state_change(sk);

		if (parent)
		parent->sk_data_ready(parent, 0);

		release_sock(sk);
		}

		static struct l2cap_ops l2cap_chan_ops = {
		.name = "L2CAP Socket Interface",
		.new_connection = l2cap_sock_new_connection_cb,
		@@ -1021,6 +1041,7 @@ static struct l2cap_ops l2cap_chan_ops = {
		.close = l2cap_sock_close_cb,
		.teardown = l2cap_sock_teardown_cb,
		.state_change = l2cap_sock_state_change_cb,
		.ready = l2cap_sock_ready_cb,
		.alloc_skb = l2cap_sock_alloc_skb_cb,
		};