Bluetooth: Trasmit interrupt channel messages first

interrupt channel is low latency.

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

1 files changed, 17 insertions, 8 deletions

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 2694a0a6186d..6cb1d9e8eac5 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -663,25 +663,32 @@ static int hidp_send_frame(struct socket *sock, unsigned char *data, int len)
         return kernel_sendmsg(sock, &msg, &iv, 1, len);
 }
 
-static void hidp_process_transmit(struct hidp_session *session)
+static void hidp_process_intr_transmit(struct hidp_session *session)
 {
         struct sk_buff *skb;
 
         BT_DBG("session %p", session);
 
-        while ((skb = skb_dequeue(&session->ctrl_transmit))) {
-                if (hidp_send_frame(session->ctrl_sock, skb->data, skb->len) < 0) {
-                        skb_queue_head(&session->ctrl_transmit, skb);
+        while ((skb = skb_dequeue(&session->intr_transmit))) {
+                if (hidp_send_frame(session->intr_sock, skb->data, skb->len) < 0) {
+                        skb_queue_head(&session->intr_transmit, skb);
                         break;
                 }
 
                 hidp_set_timer(session);
                 kfree_skb(skb);
         }
+}
 
-        while ((skb = skb_dequeue(&session->intr_transmit))) {
-                if (hidp_send_frame(session->intr_sock, skb->data, skb->len) < 0) {
-                        skb_queue_head(&session->intr_transmit, skb);
+static void hidp_process_ctrl_transmit(struct hidp_session *session)
+{
+        struct sk_buff *skb;
+
+        BT_DBG("session %p", session);
+
+        while ((skb = skb_dequeue(&session->ctrl_transmit))) {
+                if (hidp_send_frame(session->ctrl_sock, skb->data, skb->len) < 0) {
+                        skb_queue_head(&session->ctrl_transmit, skb);
                         break;
                 }
 
@@ -722,6 +729,8 @@ static int hidp_session(void *arg)
                                 kfree_skb(skb);
                 }
 
+                hidp_process_intr_transmit(session);
+
                 while ((skb = skb_dequeue(&ctrl_sk->sk_receive_queue))) {
                         skb_orphan(skb);
                         if (!skb_linearize(skb))
@@ -730,7 +739,7 @@ static int hidp_session(void *arg)
                                 kfree_skb(skb);
                 }
 
-                hidp_process_transmit(session);
+                hidp_process_ctrl_transmit(session);
 
                 schedule();
                 set_current_state(TASK_INTERRUPTIBLE);