redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Bluetooth: make use sk_priority to priritize RFCOMM packets

Browse source 
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Luiz Augusto von Dentz 2011-11-01 10:58:58 +02:00 committed by Gustavo F. Padovan
parent 5e59b791c3
commit 262038fcb2
2 changed files with 37 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
net/bluetooth/rfcomm/core.c
View file

@ -65,7 +65,8 @@ static DEFINE_MUTEX(rfcomm_mutex);
static LIST_HEAD(session_list); static LIST_HEAD(session_list);
static int rfcomm_send_frame(struct rfcomm_session *s, u8 *data, int len); static int rfcomm_send_frame(struct rfcomm_session *s, u8 *data, int len,
u32 priority);
static int rfcomm_send_sabm(struct rfcomm_session *s, u8 dlci); static int rfcomm_send_sabm(struct rfcomm_session *s, u8 dlci);
static int rfcomm_send_disc(struct rfcomm_session *s, u8 dlci); static int rfcomm_send_disc(struct rfcomm_session *s, u8 dlci);
static int rfcomm_queue_disc(struct rfcomm_dlc *d); static int rfcomm_queue_disc(struct rfcomm_dlc *d);
@ -747,19 +748,34 @@ void rfcomm_session_getaddr(struct rfcomm_session *s, bdaddr_t *src, bdaddr_t *d
} }
/* ---- RFCOMM frame sending ---- */ /* ---- RFCOMM frame sending ---- */
static int rfcomm_send_frame(struct rfcomm_session *s, u8 *data, int len) static int rfcomm_send_frame(struct rfcomm_session *s, u8 *data, int len,
u32 priority)
{ {
struct socket *sock = s->sock; struct socket *sock = s->sock;
struct sock *sk = sock->sk;
struct kvec iv = { data, len }; struct kvec iv = { data, len };
struct msghdr msg; struct msghdr msg;
BT_DBG("session %p len %d", s, len); BT_DBG("session %p len %d priority %u", s, len, priority);
if (sk->sk_priority != priority) {
lock_sock(sk);
sk->sk_priority = priority;
release_sock(sk);
}
memset(&msg, 0, sizeof(msg)); memset(&msg, 0, sizeof(msg));
return kernel_sendmsg(sock, &msg, &iv, 1, len); return kernel_sendmsg(sock, &msg, &iv, 1, len);
} }
static int rfcomm_send_cmd(struct rfcomm_session *s, struct rfcomm_cmd *cmd)
{
BT_DBG("%p cmd %u", s, cmd->ctrl);
return rfcomm_send_frame(s, (void *) cmd, sizeof(*cmd), HCI_PRIO_MAX);
}
static int rfcomm_send_sabm(struct rfcomm_session *s, u8 dlci) static int rfcomm_send_sabm(struct rfcomm_session *s, u8 dlci)
{ {
struct rfcomm_cmd cmd; struct rfcomm_cmd cmd;
@ -771,7 +787,7 @@ static int rfcomm_send_sabm(struct rfcomm_session *s, u8 dlci)
cmd.len = __len8(0); cmd.len = __len8(0);
cmd.fcs = __fcs2((u8 *) &cmd); cmd.fcs = __fcs2((u8 *) &cmd);
return rfcomm_send_frame(s, (void *) &cmd, sizeof(cmd)); return rfcomm_send_cmd(s, &cmd);
} }
static int rfcomm_send_ua(struct rfcomm_session *s, u8 dlci) static int rfcomm_send_ua(struct rfcomm_session *s, u8 dlci)
@ -785,7 +801,7 @@ static int rfcomm_send_ua(struct rfcomm_session *s, u8 dlci)
cmd.len = __len8(0); cmd.len = __len8(0);
cmd.fcs = __fcs2((u8 *) &cmd); cmd.fcs = __fcs2((u8 *) &cmd);
return rfcomm_send_frame(s, (void *) &cmd, sizeof(cmd)); return rfcomm_send_cmd(s, &cmd);
} }
static int rfcomm_send_disc(struct rfcomm_session *s, u8 dlci) static int rfcomm_send_disc(struct rfcomm_session *s, u8 dlci)
@ -799,7 +815,7 @@ static int rfcomm_send_disc(struct rfcomm_session *s, u8 dlci)
cmd.len = __len8(0); cmd.len = __len8(0);
cmd.fcs = __fcs2((u8 *) &cmd); cmd.fcs = __fcs2((u8 *) &cmd);
return rfcomm_send_frame(s, (void *) &cmd, sizeof(cmd)); return rfcomm_send_cmd(s, &cmd);
} }
static int rfcomm_queue_disc(struct rfcomm_dlc *d) static int rfcomm_queue_disc(struct rfcomm_dlc *d)
@ -813,6 +829,8 @@ static int rfcomm_queue_disc(struct rfcomm_dlc *d)
if (!skb) if (!skb)
return -ENOMEM; return -ENOMEM;
skb->priority = HCI_PRIO_MAX;
cmd = (void *) __skb_put(skb, sizeof(*cmd)); cmd = (void *) __skb_put(skb, sizeof(*cmd));
cmd->addr = d->addr; cmd->addr = d->addr;
cmd->ctrl = __ctrl(RFCOMM_DISC, 1); cmd->ctrl = __ctrl(RFCOMM_DISC, 1);
@ -835,7 +853,7 @@ static int rfcomm_send_dm(struct rfcomm_session *s, u8 dlci)
cmd.len = __len8(0); cmd.len = __len8(0);
cmd.fcs = __fcs2((u8 *) &cmd); cmd.fcs = __fcs2((u8 *) &cmd);
return rfcomm_send_frame(s, (void *) &cmd, sizeof(cmd)); return rfcomm_send_cmd(s, &cmd);
} }
static int rfcomm_send_nsc(struct rfcomm_session *s, int cr, u8 type) static int rfcomm_send_nsc(struct rfcomm_session *s, int cr, u8 type)
@ -860,7 +878,7 @@ static int rfcomm_send_nsc(struct rfcomm_session *s, int cr, u8 type)
*ptr = __fcs(buf); ptr++; *ptr = __fcs(buf); ptr++;
return rfcomm_send_frame(s, buf, ptr - buf); return rfcomm_send_frame(s, buf, ptr - buf, HCI_PRIO_MAX);
} }
static int rfcomm_send_pn(struct rfcomm_session *s, int cr, struct rfcomm_dlc *d) static int rfcomm_send_pn(struct rfcomm_session *s, int cr, struct rfcomm_dlc *d)
@ -902,7 +920,7 @@ static int rfcomm_send_pn(struct rfcomm_session *s, int cr, struct rfcomm_dlc *d
*ptr = __fcs(buf); ptr++; *ptr = __fcs(buf); ptr++;
return rfcomm_send_frame(s, buf, ptr - buf); return rfcomm_send_frame(s, buf, ptr - buf, HCI_PRIO_MAX);
} }
int rfcomm_send_rpn(struct rfcomm_session *s, int cr, u8 dlci, int rfcomm_send_rpn(struct rfcomm_session *s, int cr, u8 dlci,
@ -940,7 +958,7 @@ int rfcomm_send_rpn(struct rfcomm_session *s, int cr, u8 dlci,
*ptr = __fcs(buf); ptr++; *ptr = __fcs(buf); ptr++;
return rfcomm_send_frame(s, buf, ptr - buf); return rfcomm_send_frame(s, buf, ptr - buf, HCI_PRIO_MAX);
} }
static int rfcomm_send_rls(struct rfcomm_session *s, int cr, u8 dlci, u8 status) static int rfcomm_send_rls(struct rfcomm_session *s, int cr, u8 dlci, u8 status)
@ -967,7 +985,7 @@ static int rfcomm_send_rls(struct rfcomm_session *s, int cr, u8 dlci, u8 status)
*ptr = __fcs(buf); ptr++; *ptr = __fcs(buf); ptr++;
return rfcomm_send_frame(s, buf, ptr - buf); return rfcomm_send_frame(s, buf, ptr - buf, HCI_PRIO_MAX);
} }
static int rfcomm_send_msc(struct rfcomm_session *s, int cr, u8 dlci, u8 v24_sig) static int rfcomm_send_msc(struct rfcomm_session *s, int cr, u8 dlci, u8 v24_sig)
@ -994,7 +1012,7 @@ static int rfcomm_send_msc(struct rfcomm_session *s, int cr, u8 dlci, u8 v24_sig
*ptr = __fcs(buf); ptr++; *ptr = __fcs(buf); ptr++;
return rfcomm_send_frame(s, buf, ptr - buf); return rfcomm_send_frame(s, buf, ptr - buf, HCI_PRIO_MAX);
} }
static int rfcomm_send_fcoff(struct rfcomm_session *s, int cr) static int rfcomm_send_fcoff(struct rfcomm_session *s, int cr)
@ -1016,7 +1034,7 @@ static int rfcomm_send_fcoff(struct rfcomm_session *s, int cr)
*ptr = __fcs(buf); ptr++; *ptr = __fcs(buf); ptr++;
return rfcomm_send_frame(s, buf, ptr - buf); return rfcomm_send_frame(s, buf, ptr - buf, HCI_PRIO_MAX);
} }
static int rfcomm_send_fcon(struct rfcomm_session *s, int cr) static int rfcomm_send_fcon(struct rfcomm_session *s, int cr)
@ -1038,7 +1056,7 @@ static int rfcomm_send_fcon(struct rfcomm_session *s, int cr)
*ptr = __fcs(buf); ptr++; *ptr = __fcs(buf); ptr++;
return rfcomm_send_frame(s, buf, ptr - buf); return rfcomm_send_frame(s, buf, ptr - buf, HCI_PRIO_MAX);
} }
static int rfcomm_send_test(struct rfcomm_session *s, int cr, u8 *pattern, int len) static int rfcomm_send_test(struct rfcomm_session *s, int cr, u8 *pattern, int len)
@ -1089,7 +1107,7 @@ static int rfcomm_send_credits(struct rfcomm_session *s, u8 addr, u8 credits)
*ptr = __fcs(buf); ptr++; *ptr = __fcs(buf); ptr++;
return rfcomm_send_frame(s, buf, ptr - buf); return rfcomm_send_frame(s, buf, ptr - buf, HCI_PRIO_MAX);
} }
static void rfcomm_make_uih(struct sk_buff *skb, u8 addr) static void rfcomm_make_uih(struct sk_buff *skb, u8 addr)
@ -1767,7 +1785,8 @@ static inline int rfcomm_process_tx(struct rfcomm_dlc *d)
return skb_queue_len(&d->tx_queue); return skb_queue_len(&d->tx_queue);
while (d->tx_credits && (skb = skb_dequeue(&d->tx_queue))) { while (d->tx_credits && (skb = skb_dequeue(&d->tx_queue))) {
err = rfcomm_send_frame(d->session, skb->data, skb->len); err = rfcomm_send_frame(d->session, skb->data, skb->len,
skb->priority);
if (err < 0) { if (err < 0) {
skb_queue_head(&d->tx_queue, skb); skb_queue_head(&d->tx_queue, skb);
break; break;

2
net/bluetooth/rfcomm/sock.c
View file

@ -597,6 +597,8 @@ static int rfcomm_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
break; break;
} }
skb->priority = sk->sk_priority;
err = rfcomm_dlc_send(d, skb); err = rfcomm_dlc_send(d, skb);
if (err < 0) { if (err < 0) {
kfree_skb(skb); kfree_skb(skb);