Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 246927
b: refs/heads/master
c: 58d35f8
h: refs/heads/master
i:
  246925: 06bc94b
  246923: 78c1ceb
  246919: 79da228
  246911: 83fdc10
v: v3
  • Loading branch information
Gustavo F. Padovan committed Apr 13, 2011
1 parent 7851677 commit 583dbe3
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 28 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: c916fbe45c1f30417fa28e62cbbfae295a3f315c
refs/heads/master: 58d35f87effa0235181a24d55576aaa756ef7312
4 changes: 2 additions & 2 deletions trunk/include/net/bluetooth/l2cap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,8 @@ struct l2cap_chan {
struct timer_list retrans_timer;
struct timer_list monitor_timer;
struct timer_list ack_timer;
struct sk_buff *tx_send_head;
struct sk_buff_head tx_q;
struct sk_buff_head srej_q;
struct sk_buff_head busy_q;
struct work_struct busy_work;
Expand Down Expand Up @@ -355,7 +357,6 @@ struct l2cap_conn {

/* ----- L2CAP socket info ----- */
#define l2cap_pi(sk) ((struct l2cap_pinfo *) sk)
#define TX_QUEUE(sk) (&l2cap_pi(sk)->tx_queue)

struct l2cap_pinfo {
struct bt_sock bt;
Expand Down Expand Up @@ -384,7 +385,6 @@ struct l2cap_pinfo {

__le16 sport;

struct sk_buff_head tx_queue;
struct l2cap_conn *conn;
struct l2cap_chan *chan;
};
Expand Down
40 changes: 19 additions & 21 deletions trunk/net/bluetooth/l2cap_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err)
l2cap_pi(sk)->conf_state & L2CAP_CONF_INPUT_DONE))
goto free;

skb_queue_purge(TX_QUEUE(sk));
skb_queue_purge(&chan->tx_q);

if (l2cap_pi(sk)->mode == L2CAP_MODE_ERTM) {
struct srej_list *l, *tmp;
Expand Down Expand Up @@ -477,7 +477,7 @@ void l2cap_send_disconn_req(struct l2cap_conn *conn, struct l2cap_chan *chan, in

sk = chan->sk;

skb_queue_purge(TX_QUEUE(sk));
skb_queue_purge(&chan->tx_q);

if (l2cap_pi(sk)->mode == L2CAP_MODE_ERTM) {
del_timer(&chan->retrans_timer);
Expand Down Expand Up @@ -996,15 +996,14 @@ static void l2cap_retrans_timeout(unsigned long arg)

static void l2cap_drop_acked_frames(struct l2cap_chan *chan)
{
struct sock *sk = chan->sk;
struct sk_buff *skb;

while ((skb = skb_peek(TX_QUEUE(sk))) &&
while ((skb = skb_peek(&chan->tx_q)) &&
chan->unacked_frames) {
if (bt_cb(skb)->tx_seq == chan->expected_ack_seq)
break;

skb = skb_dequeue(TX_QUEUE(sk));
skb = skb_dequeue(&chan->tx_q);
kfree_skb(skb);

chan->unacked_frames--;
Expand Down Expand Up @@ -1037,7 +1036,7 @@ void l2cap_streaming_send(struct l2cap_chan *chan)
struct l2cap_pinfo *pi = l2cap_pi(sk);
u16 control, fcs;

while ((skb = skb_dequeue(TX_QUEUE(sk)))) {
while ((skb = skb_dequeue(&chan->tx_q))) {
control = get_unaligned_le16(skb->data + L2CAP_HDR_SIZE);
control |= chan->next_tx_seq << L2CAP_CTRL_TXSEQ_SHIFT;
put_unaligned_le16(control, skb->data + L2CAP_HDR_SIZE);
Expand All @@ -1060,18 +1059,18 @@ static void l2cap_retransmit_one_frame(struct l2cap_chan *chan, u8 tx_seq)
struct sk_buff *skb, *tx_skb;
u16 control, fcs;

skb = skb_peek(TX_QUEUE(sk));
skb = skb_peek(&chan->tx_q);
if (!skb)
return;

do {
if (bt_cb(skb)->tx_seq == tx_seq)
break;

if (skb_queue_is_last(TX_QUEUE(sk), skb))
if (skb_queue_is_last(&chan->tx_q, skb))
return;

} while ((skb = skb_queue_next(TX_QUEUE(sk), skb)));
} while ((skb = skb_queue_next(&chan->tx_q, skb)));

if (chan->remote_max_tx &&
bt_cb(skb)->retries == chan->remote_max_tx) {
Expand Down Expand Up @@ -1112,7 +1111,7 @@ int l2cap_ertm_send(struct l2cap_chan *chan)
if (sk->sk_state != BT_CONNECTED)
return -ENOTCONN;

while ((skb = sk->sk_send_head) && (!l2cap_tx_window_full(chan))) {
while ((skb = chan->tx_send_head) && (!l2cap_tx_window_full(chan))) {

if (chan->remote_max_tx &&
bt_cb(skb)->retries == chan->remote_max_tx) {
Expand Down Expand Up @@ -1153,10 +1152,10 @@ int l2cap_ertm_send(struct l2cap_chan *chan)

chan->frames_sent++;

if (skb_queue_is_last(TX_QUEUE(sk), skb))
sk->sk_send_head = NULL;
if (skb_queue_is_last(&chan->tx_q, skb))
chan->tx_send_head = NULL;
else
sk->sk_send_head = skb_queue_next(TX_QUEUE(sk), skb);
chan->tx_send_head = skb_queue_next(&chan->tx_q, skb);

nsent++;
}
Expand All @@ -1166,11 +1165,10 @@ int l2cap_ertm_send(struct l2cap_chan *chan)

static int l2cap_retransmit_frames(struct l2cap_chan *chan)
{
struct sock *sk = chan->sk;
int ret;

if (!skb_queue_empty(TX_QUEUE(sk)))
sk->sk_send_head = TX_QUEUE(sk)->next;
if (!skb_queue_empty(&chan->tx_q))
chan->tx_send_head = chan->tx_q.next;

chan->next_tx_seq = chan->expected_ack_seq;
ret = l2cap_ertm_send(chan);
Expand Down Expand Up @@ -1384,9 +1382,9 @@ int l2cap_sar_segment_sdu(struct l2cap_chan *chan, struct msghdr *msg, size_t le
len -= buflen;
size += buflen;
}
skb_queue_splice_tail(&sar_queue, TX_QUEUE(sk));
if (sk->sk_send_head == NULL)
sk->sk_send_head = sar_queue.next;
skb_queue_splice_tail(&sar_queue, &chan->tx_q);
if (chan->tx_send_head == NULL)
chan->tx_send_head = sar_queue.next;

return size;
}
Expand Down Expand Up @@ -2319,7 +2317,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr

chan->next_tx_seq = 0;
chan->expected_tx_seq = 0;
__skb_queue_head_init(TX_QUEUE(sk));
skb_queue_head_init(&chan->tx_q);
if (l2cap_pi(sk)->mode == L2CAP_MODE_ERTM)
l2cap_ertm_init(chan);

Expand Down Expand Up @@ -2410,7 +2408,7 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr
sk->sk_state = BT_CONNECTED;
chan->next_tx_seq = 0;
chan->expected_tx_seq = 0;
__skb_queue_head_init(TX_QUEUE(sk));
skb_queue_head_init(&chan->tx_q);
if (l2cap_pi(sk)->mode == L2CAP_MODE_ERTM)
l2cap_ertm_init(chan);

Expand Down
7 changes: 3 additions & 4 deletions trunk/net/bluetooth/l2cap_sock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -764,10 +764,10 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms
err = PTR_ERR(skb);
goto done;
}
__skb_queue_tail(TX_QUEUE(sk), skb);
__skb_queue_tail(&pi->chan->tx_q, skb);

if (sk->sk_send_head == NULL)
sk->sk_send_head = skb;
if (pi->chan->tx_send_head == NULL)
pi->chan->tx_send_head = skb;

} else {
/* Segment SDU into multiples PDUs */
Expand Down Expand Up @@ -1017,7 +1017,6 @@ void l2cap_sock_init(struct sock *sk, struct sock *parent)

/* Default config options */
pi->flush_to = L2CAP_DEFAULT_FLUSH_TO;
skb_queue_head_init(TX_QUEUE(sk));
}

static struct proto l2cap_proto = {
Expand Down

0 comments on commit 583dbe3

Please sign in to comment.