Bluetooth: Move check for backlog size to l2cap_sock.c (53826692) · Commits · 戴 / test

net/bluetooth/l2cap_core.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -1156,12 +1156,6 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)

		lock_sock(parent);

		/* Check for backlog size */
		if (sk_acceptq_is_full(parent)) {
		BT_DBG("backlog full %d", parent->sk_ack_backlog);
		goto clean;
		}

		chan = pchan->ops->new_connection(pchan);
		if (!chan)
		goto clean;
		@@ -3349,12 +3343,6 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd

		result = L2CAP_CR_NO_MEM;

		/* Check for backlog size */
		if (sk_acceptq_is_full(parent)) {
		BT_DBG("backlog full %d", parent->sk_ack_backlog);
		goto response;
		}

		chan = pchan->ops->new_connection(pchan);
		if (!chan)
		goto response;

+6 −0

Original line number	Diff line number	Diff line
		@@ -895,6 +895,12 @@ static struct l2cap_chan l2cap_sock_new_connection_cb(struct l2cap_chan chan)
		{
		struct sock sk, parent = chan->data;

		/* Check for backlog size */
		if (sk_acceptq_is_full(parent)) {
		BT_DBG("backlog full %d", parent->sk_ack_backlog);
		return NULL;
		}

		sk = l2cap_sock_alloc(sock_net(parent), NULL, BTPROTO_L2CAP,
		GFP_ATOMIC);
		if (!sk)