Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 277711
b: refs/heads/master
c: 262038f
h: refs/heads/master
i:
  277709: 2f1c9df
  277707: 7756757
  277703: aee624a
  277695: c6cd586
v: v3
  • Loading branch information
Luiz Augusto von Dentz authored and Gustavo F. Padovan committed Nov 7, 2011
1 parent 07f8550 commit 34d3159
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5e59b791c3561e2fbb4aee17df3505ad25c16b7a
refs/heads/master: 262038fcb2a50e9b5553243452918fda08cdf83d
51 changes: 35 additions & 16 deletions trunk/net/bluetooth/rfcomm/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ static DEFINE_MUTEX(rfcomm_mutex);

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_disc(struct rfcomm_session *s, u8 dlci);
static int rfcomm_queue_disc(struct rfcomm_dlc *d);
Expand Down Expand Up @@ -747,19 +748,34 @@ void rfcomm_session_getaddr(struct rfcomm_session *s, bdaddr_t *src, bdaddr_t *d
}

/* ---- 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 sock *sk = sock->sk;
struct kvec iv = { data, len };
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));

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)
{
struct rfcomm_cmd cmd;
Expand All @@ -771,7 +787,7 @@ static int rfcomm_send_sabm(struct rfcomm_session *s, u8 dlci)
cmd.len = __len8(0);
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)
Expand All @@ -785,7 +801,7 @@ static int rfcomm_send_ua(struct rfcomm_session *s, u8 dlci)
cmd.len = __len8(0);
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)
Expand All @@ -799,7 +815,7 @@ static int rfcomm_send_disc(struct rfcomm_session *s, u8 dlci)
cmd.len = __len8(0);
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)
Expand All @@ -813,6 +829,8 @@ static int rfcomm_queue_disc(struct rfcomm_dlc *d)
if (!skb)
return -ENOMEM;

skb->priority = HCI_PRIO_MAX;

cmd = (void *) __skb_put(skb, sizeof(*cmd));
cmd->addr = d->addr;
cmd->ctrl = __ctrl(RFCOMM_DISC, 1);
Expand All @@ -835,7 +853,7 @@ static int rfcomm_send_dm(struct rfcomm_session *s, u8 dlci)
cmd.len = __len8(0);
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)
Expand All @@ -860,7 +878,7 @@ static int rfcomm_send_nsc(struct rfcomm_session *s, int cr, u8 type)

*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)
Expand Down Expand Up @@ -902,7 +920,7 @@ static int rfcomm_send_pn(struct rfcomm_session *s, int cr, struct rfcomm_dlc *d

*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,
Expand Down Expand Up @@ -940,7 +958,7 @@ int rfcomm_send_rpn(struct rfcomm_session *s, int cr, u8 dlci,

*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)
Expand All @@ -967,7 +985,7 @@ static int rfcomm_send_rls(struct rfcomm_session *s, int cr, u8 dlci, u8 status)

*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)
Expand All @@ -994,7 +1012,7 @@ static int rfcomm_send_msc(struct rfcomm_session *s, int cr, u8 dlci, u8 v24_sig

*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)
Expand All @@ -1016,7 +1034,7 @@ static int rfcomm_send_fcoff(struct rfcomm_session *s, int cr)

*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)
Expand All @@ -1038,7 +1056,7 @@ static int rfcomm_send_fcon(struct rfcomm_session *s, int cr)

*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)
Expand Down Expand Up @@ -1089,7 +1107,7 @@ static int rfcomm_send_credits(struct rfcomm_session *s, u8 addr, u8 credits)

*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)
Expand Down Expand Up @@ -1767,7 +1785,8 @@ static inline int rfcomm_process_tx(struct rfcomm_dlc *d)
return skb_queue_len(&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) {
skb_queue_head(&d->tx_queue, skb);
break;
Expand Down
2 changes: 2 additions & 0 deletions trunk/net/bluetooth/rfcomm/sock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,8 @@ static int rfcomm_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
break;
}

skb->priority = sk->sk_priority;

err = rfcomm_dlc_send(d, skb);
if (err < 0) {
kfree_skb(skb);
Expand Down

0 comments on commit 34d3159

Please sign in to comment.