Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7350e6cf authored by David Herrmann's avatar David Herrmann Committed by Gustavo Padovan
Browse files

Bluetooth: hidp: merge hidp_process_{ctrl,intr}_transmit() 



Both hidp_process_ctrl_transmit() and hidp_process_intr_transmit() are
exactly the same apart from the transmit-queue and socket pointers.
Therefore, pass them as argument and merge both functions into one so we
avoid 25 lines of code-duplication.

Signed-off-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 2df01200

net/bluetooth/hidp/core.c

+11 −29
Original line number Original line Diff line number Diff line
@@ -636,40 +636,20 @@ static int hidp_send_frame(struct socket *sock, unsigned char *data, int len) 
	return kernel_sendmsg(sock, &msg, &iv, 1, len);

	return kernel_sendmsg(sock, &msg, &iv, 1, len);

}

}





static void hidp_process_intr_transmit(struct hidp_session *session)

/* dequeue message from @transmit and send via @sock */

static void hidp_process_transmit(struct hidp_session *session,

				  struct sk_buff_head *transmit,

				  struct socket *sock)

{

{

	struct sk_buff *skb;

	struct sk_buff *skb;

	int ret;

	int ret;





	BT_DBG("session %p", session);

	BT_DBG("session %p", session);





	while ((skb = skb_dequeue(&session->intr_transmit))) {

	while ((skb = skb_dequeue(transmit))) {

		ret = hidp_send_frame(session->intr_sock, skb->data, skb->len);

		ret = hidp_send_frame(sock, skb->data, skb->len);

		if (ret == -EAGAIN) {

		if (ret == -EAGAIN) {

			skb_queue_head(&session->intr_transmit, skb);

			skb_queue_head(transmit, skb);

			break;

		} else if (ret < 0) {

			hidp_session_terminate(session);

			kfree_skb(skb);

			break;

		}



		hidp_set_timer(session);

		kfree_skb(skb);

	}

}



static void hidp_process_ctrl_transmit(struct hidp_session *session)

{

	struct sk_buff *skb;

	int ret;



	BT_DBG("session %p", session);



	while ((skb = skb_dequeue(&session->ctrl_transmit))) {

		ret = hidp_send_frame(session->ctrl_sock, skb->data, skb->len);

		if (ret == -EAGAIN) {

			skb_queue_head(&session->ctrl_transmit, skb);

			break;

			break;

		} else if (ret < 0) {

		} else if (ret < 0) {

			hidp_session_terminate(session);

			hidp_session_terminate(session);
@@ -1224,7 +1204,8 @@ static void hidp_session_run(struct hidp_session *session) 
		}

		}





		/* send pending intr-skbs */

		/* send pending intr-skbs */

		hidp_process_intr_transmit(session);

		hidp_process_transmit(session, &session->intr_transmit,

				      session->intr_sock);





		/* parse incoming ctrl-skbs */

		/* parse incoming ctrl-skbs */

		while ((skb = skb_dequeue(&ctrl_sk->sk_receive_queue))) {

		while ((skb = skb_dequeue(&ctrl_sk->sk_receive_queue))) {
@@ -1236,7 +1217,8 @@ static void hidp_session_run(struct hidp_session *session) 
		}

		}





		/* send pending ctrl-skbs */

		/* send pending ctrl-skbs */

		hidp_process_ctrl_transmit(session);

		hidp_process_transmit(session, &session->ctrl_transmit,

				      session->ctrl_sock);





		schedule();

		schedule();

	}

	}