Skip to content

L
linux
Commit 42e5c802 authored by Gustavo F. Padovan's avatar Gustavo F. Padovan
Browse files
Options

Bluetooth: Move of ERTM *_seq vars to struct l2cap_chan 

As part of the moving channel to stuff to struct l2cap_chan.
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 525cd185
Show whitespace changes
Inline Side-by-side
Showing with 73 additions and 77 deletions
include/net/bluetooth/l2cap.h
View file @ 42e5c802
...@@ -288,6 +288,12 @@ struct l2cap_chan { ...@@ -288,6 +288,12 @@ struct l2cap_chan {
__u16 conn_state; __u16 conn_state;
__u8 next_tx_seq;
__u8 expected_ack_seq;
__u8 expected_tx_seq;
__u8 buffer_seq;
__u8 buffer_seq_srej;
struct list_head list; struct list_head list;
}; };
...@@ -353,11 +359,6 @@ struct l2cap_pinfo { ...@@ -353,11 +359,6 @@ struct l2cap_pinfo {
__u8 conf_state; __u8 conf_state;
__u8 next_tx_seq;
__u8 expected_ack_seq;
__u8 expected_tx_seq;
__u8 buffer_seq;
__u8 buffer_seq_srej;
__u8 srej_save_reqseq; __u8 srej_save_reqseq;
__u8 frames_sent; __u8 frames_sent;
__u8 unacked_frames; __u8 unacked_frames;
...@@ -421,17 +422,16 @@ struct l2cap_pinfo { ...@@ -421,17 +422,16 @@ struct l2cap_pinfo {
#define __mod_ack_timer() mod_timer(&l2cap_pi(sk)->ack_timer, \ #define __mod_ack_timer() mod_timer(&l2cap_pi(sk)->ack_timer, \
jiffies + msecs_to_jiffies(L2CAP_DEFAULT_ACK_TO)); jiffies + msecs_to_jiffies(L2CAP_DEFAULT_ACK_TO));
static inline int l2cap_tx_window_full(struct sock *sk) static inline int l2cap_tx_window_full(struct l2cap_chan *ch)
{ {
struct l2cap_pinfo *pi = l2cap_pi(sk);
int sub; int sub;
sub = (pi->next_tx_seq - pi->expected_ack_seq) % 64; sub = (ch->next_tx_seq - ch->expected_ack_seq) % 64;
if (sub < 0) if (sub < 0)
sub += 64; sub += 64;
return sub == pi->remote_tx_win; return sub == l2cap_pi(ch->sk)->remote_tx_win;
} }
#define __get_txseq(ctrl) (((ctrl) & L2CAP_CTRL_TXSEQ) >> 1) #define __get_txseq(ctrl) (((ctrl) & L2CAP_CTRL_TXSEQ) >> 1)
...@@ -456,7 +456,7 @@ struct sk_buff *l2cap_create_basic_pdu(struct sock *sk, struct msghdr *msg, size ...@@ -456,7 +456,7 @@ struct sk_buff *l2cap_create_basic_pdu(struct sock *sk, struct msghdr *msg, size
struct sk_buff *l2cap_create_iframe_pdu(struct sock *sk, struct msghdr *msg, size_t len, u16 control, u16 sdulen); struct sk_buff *l2cap_create_iframe_pdu(struct sock *sk, struct msghdr *msg, size_t len, u16 control, u16 sdulen);
int l2cap_sar_segment_sdu(struct sock *sk, struct msghdr *msg, size_t len); int l2cap_sar_segment_sdu(struct sock *sk, struct msghdr *msg, size_t len);
void l2cap_do_send(struct sock *sk, struct sk_buff *skb); void l2cap_do_send(struct sock *sk, struct sk_buff *skb);
void l2cap_streaming_send(struct sock *sk); void l2cap_streaming_send(struct l2cap_chan *chan);
int l2cap_ertm_send(struct l2cap_chan *chan); int l2cap_ertm_send(struct l2cap_chan *chan);
void l2cap_sock_set_timer(struct sock *sk, long timeout); void l2cap_sock_set_timer(struct sock *sk, long timeout);
......
net/bluetooth/l2cap_core.c
View file @ 42e5c802
...@@ -395,15 +395,13 @@ static inline void l2cap_send_sframe(struct l2cap_chan *chan, u16 control) ...@@ -395,15 +395,13 @@ static inline void l2cap_send_sframe(struct l2cap_chan *chan, u16 control)
static inline void l2cap_send_rr_or_rnr(struct l2cap_chan *chan, u16 control) static inline void l2cap_send_rr_or_rnr(struct l2cap_chan *chan, u16 control)
{ {
struct l2cap_pinfo *pi = l2cap_pi(chan->sk);
if (chan->conn_state & L2CAP_CONN_LOCAL_BUSY) { if (chan->conn_state & L2CAP_CONN_LOCAL_BUSY) {
control |= L2CAP_SUPER_RCV_NOT_READY; control |= L2CAP_SUPER_RCV_NOT_READY;
chan->conn_state |= L2CAP_CONN_RNR_SENT; chan->conn_state |= L2CAP_CONN_RNR_SENT;
} else } else
control |= L2CAP_SUPER_RCV_READY; control |= L2CAP_SUPER_RCV_READY;
control |= pi->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT; control |= chan->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT;
l2cap_send_sframe(chan, control); l2cap_send_sframe(chan, control);
} }
...@@ -988,13 +986,14 @@ static void l2cap_retrans_timeout(unsigned long arg) ...@@ -988,13 +986,14 @@ static void l2cap_retrans_timeout(unsigned long arg)
bh_unlock_sock(sk); bh_unlock_sock(sk);
} }
static void l2cap_drop_acked_frames(struct sock *sk) static void l2cap_drop_acked_frames(struct l2cap_chan *chan)
{ {
struct sock *sk = chan->sk;
struct sk_buff *skb; struct sk_buff *skb;
while ((skb = skb_peek(TX_QUEUE(sk))) && while ((skb = skb_peek(TX_QUEUE(sk))) &&
l2cap_pi(sk)->unacked_frames) { l2cap_pi(sk)->unacked_frames) {
if (bt_cb(skb)->tx_seq == l2cap_pi(sk)->expected_ack_seq) if (bt_cb(skb)->tx_seq == chan->expected_ack_seq)
break; break;
skb = skb_dequeue(TX_QUEUE(sk)); skb = skb_dequeue(TX_QUEUE(sk));
...@@ -1023,15 +1022,16 @@ void l2cap_do_send(struct sock *sk, struct sk_buff *skb) ...@@ -1023,15 +1022,16 @@ void l2cap_do_send(struct sock *sk, struct sk_buff *skb)
hci_send_acl(hcon, skb, flags); hci_send_acl(hcon, skb, flags);
} }
void l2cap_streaming_send(struct sock *sk) void l2cap_streaming_send(struct l2cap_chan *chan)
{ {
struct sock *sk = chan->sk;
struct sk_buff *skb; struct sk_buff *skb;
struct l2cap_pinfo *pi = l2cap_pi(sk); struct l2cap_pinfo *pi = l2cap_pi(sk);
u16 control, fcs; u16 control, fcs;
while ((skb = skb_dequeue(TX_QUEUE(sk)))) { while ((skb = skb_dequeue(TX_QUEUE(sk)))) {
control = get_unaligned_le16(skb->data + L2CAP_HDR_SIZE); control = get_unaligned_le16(skb->data + L2CAP_HDR_SIZE);
control |= pi->next_tx_seq << L2CAP_CTRL_TXSEQ_SHIFT; control |= chan->next_tx_seq << L2CAP_CTRL_TXSEQ_SHIFT;
put_unaligned_le16(control, skb->data + L2CAP_HDR_SIZE); put_unaligned_le16(control, skb->data + L2CAP_HDR_SIZE);
if (pi->fcs == L2CAP_FCS_CRC16) { if (pi->fcs == L2CAP_FCS_CRC16) {
...@@ -1041,7 +1041,7 @@ void l2cap_streaming_send(struct sock *sk) ...@@ -1041,7 +1041,7 @@ void l2cap_streaming_send(struct sock *sk)
l2cap_do_send(sk, skb); l2cap_do_send(sk, skb);
pi->next_tx_seq = (pi->next_tx_seq + 1) % 64; chan->next_tx_seq = (chan->next_tx_seq + 1) % 64;
} }
} }
...@@ -1080,7 +1080,7 @@ static void l2cap_retransmit_one_frame(struct l2cap_chan *chan, u8 tx_seq) ...@@ -1080,7 +1080,7 @@ static void l2cap_retransmit_one_frame(struct l2cap_chan *chan, u8 tx_seq)
chan->conn_state &= ~L2CAP_CONN_SEND_FBIT; chan->conn_state &= ~L2CAP_CONN_SEND_FBIT;
} }
control |= (pi->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT) control |= (chan->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT)
| (tx_seq << L2CAP_CTRL_TXSEQ_SHIFT); | (tx_seq << L2CAP_CTRL_TXSEQ_SHIFT);
put_unaligned_le16(control, tx_skb->data + L2CAP_HDR_SIZE); put_unaligned_le16(control, tx_skb->data + L2CAP_HDR_SIZE);
...@@ -1104,7 +1104,7 @@ int l2cap_ertm_send(struct l2cap_chan *chan) ...@@ -1104,7 +1104,7 @@ int l2cap_ertm_send(struct l2cap_chan *chan)
if (sk->sk_state != BT_CONNECTED) if (sk->sk_state != BT_CONNECTED)
return -ENOTCONN; return -ENOTCONN;
while ((skb = sk->sk_send_head) && (!l2cap_tx_window_full(sk))) { while ((skb = sk->sk_send_head) && (!l2cap_tx_window_full(chan))) {
if (pi->remote_max_tx && if (pi->remote_max_tx &&
bt_cb(skb)->retries == pi->remote_max_tx) { bt_cb(skb)->retries == pi->remote_max_tx) {
...@@ -1123,8 +1123,8 @@ int l2cap_ertm_send(struct l2cap_chan *chan) ...@@ -1123,8 +1123,8 @@ int l2cap_ertm_send(struct l2cap_chan *chan)
control |= L2CAP_CTRL_FINAL; control |= L2CAP_CTRL_FINAL;
chan->conn_state &= ~L2CAP_CONN_SEND_FBIT; chan->conn_state &= ~L2CAP_CONN_SEND_FBIT;
} }
control |= (pi->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT) control |= (chan->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT)
| (pi->next_tx_seq << L2CAP_CTRL_TXSEQ_SHIFT); | (chan->next_tx_seq << L2CAP_CTRL_TXSEQ_SHIFT);
put_unaligned_le16(control, tx_skb->data + L2CAP_HDR_SIZE); put_unaligned_le16(control, tx_skb->data + L2CAP_HDR_SIZE);
...@@ -1137,8 +1137,8 @@ int l2cap_ertm_send(struct l2cap_chan *chan) ...@@ -1137,8 +1137,8 @@ int l2cap_ertm_send(struct l2cap_chan *chan)
__mod_retrans_timer(); __mod_retrans_timer();
bt_cb(skb)->tx_seq = pi->next_tx_seq; bt_cb(skb)->tx_seq = chan->next_tx_seq;
pi->next_tx_seq = (pi->next_tx_seq + 1) % 64; chan->next_tx_seq = (chan->next_tx_seq + 1) % 64;
if (bt_cb(skb)->retries == 1) if (bt_cb(skb)->retries == 1)
pi->unacked_frames++; pi->unacked_frames++;
...@@ -1159,23 +1159,21 @@ int l2cap_ertm_send(struct l2cap_chan *chan) ...@@ -1159,23 +1159,21 @@ int l2cap_ertm_send(struct l2cap_chan *chan)
static int l2cap_retransmit_frames(struct l2cap_chan *chan) static int l2cap_retransmit_frames(struct l2cap_chan *chan)
{ {
struct sock *sk = chan->sk; struct sock *sk = chan->sk;
struct l2cap_pinfo *pi = l2cap_pi(sk);
int ret; int ret;
if (!skb_queue_empty(TX_QUEUE(sk))) if (!skb_queue_empty(TX_QUEUE(sk)))
sk->sk_send_head = TX_QUEUE(sk)->next; sk->sk_send_head = TX_QUEUE(sk)->next;
pi->next_tx_seq = pi->expected_ack_seq; chan->next_tx_seq = chan->expected_ack_seq;
ret = l2cap_ertm_send(chan); ret = l2cap_ertm_send(chan);
return ret; return ret;
} }
static void l2cap_send_ack(struct l2cap_chan *chan) static void l2cap_send_ack(struct l2cap_chan *chan)
{ {
struct sock *sk = chan->sk;
u16 control = 0; u16 control = 0;
control |= l2cap_pi(sk)->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT; control |= chan->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT;
if (chan->conn_state & L2CAP_CONN_LOCAL_BUSY) { if (chan->conn_state & L2CAP_CONN_LOCAL_BUSY) {
control |= L2CAP_SUPER_RCV_NOT_READY; control |= L2CAP_SUPER_RCV_NOT_READY;
...@@ -1575,9 +1573,9 @@ static inline void l2cap_ertm_init(struct l2cap_chan *chan) ...@@ -1575,9 +1573,9 @@ static inline void l2cap_ertm_init(struct l2cap_chan *chan)
{ {
struct sock *sk = chan->sk; struct sock *sk = chan->sk;
l2cap_pi(sk)->expected_ack_seq = 0; chan->expected_ack_seq = 0;
l2cap_pi(sk)->unacked_frames = 0; l2cap_pi(sk)->unacked_frames = 0;
l2cap_pi(sk)->buffer_seq = 0; chan->buffer_seq = 0;
l2cap_pi(sk)->num_acked = 0; l2cap_pi(sk)->num_acked = 0;
l2cap_pi(sk)->frames_sent = 0; l2cap_pi(sk)->frames_sent = 0;
...@@ -2311,8 +2309,8 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr ...@@ -2311,8 +2309,8 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr
sk->sk_state = BT_CONNECTED; sk->sk_state = BT_CONNECTED;
l2cap_pi(sk)->next_tx_seq = 0; chan->next_tx_seq = 0;
l2cap_pi(sk)->expected_tx_seq = 0; chan->expected_tx_seq = 0;
__skb_queue_head_init(TX_QUEUE(sk)); __skb_queue_head_init(TX_QUEUE(sk));
if (l2cap_pi(sk)->mode == L2CAP_MODE_ERTM) if (l2cap_pi(sk)->mode == L2CAP_MODE_ERTM)
l2cap_ertm_init(chan); l2cap_ertm_init(chan);
...@@ -2402,8 +2400,8 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr ...@@ -2402,8 +2400,8 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr
set_default_fcs(l2cap_pi(sk)); set_default_fcs(l2cap_pi(sk));
sk->sk_state = BT_CONNECTED; sk->sk_state = BT_CONNECTED;
l2cap_pi(sk)->next_tx_seq = 0; chan->next_tx_seq = 0;
l2cap_pi(sk)->expected_tx_seq = 0; chan->expected_tx_seq = 0;
__skb_queue_head_init(TX_QUEUE(sk)); __skb_queue_head_init(TX_QUEUE(sk));
if (l2cap_pi(sk)->mode == L2CAP_MODE_ERTM) if (l2cap_pi(sk)->mode == L2CAP_MODE_ERTM)
l2cap_ertm_init(chan); l2cap_ertm_init(chan);
...@@ -2794,7 +2792,7 @@ static inline void l2cap_send_i_or_rr_or_rnr(struct l2cap_chan *chan) ...@@ -2794,7 +2792,7 @@ static inline void l2cap_send_i_or_rr_or_rnr(struct l2cap_chan *chan)
pi->frames_sent = 0; pi->frames_sent = 0;
control |= pi->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT; control |= chan->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT;
if (chan->conn_state & L2CAP_CONN_LOCAL_BUSY) { if (chan->conn_state & L2CAP_CONN_LOCAL_BUSY) {
control |= L2CAP_SUPER_RCV_NOT_READY; control |= L2CAP_SUPER_RCV_NOT_READY;
...@@ -2814,10 +2812,10 @@ static inline void l2cap_send_i_or_rr_or_rnr(struct l2cap_chan *chan) ...@@ -2814,10 +2812,10 @@ static inline void l2cap_send_i_or_rr_or_rnr(struct l2cap_chan *chan)
} }
} }
static int l2cap_add_to_srej_queue(struct sock *sk, struct sk_buff *skb, u8 tx_seq, u8 sar) static int l2cap_add_to_srej_queue(struct l2cap_chan *chan, struct sk_buff *skb, u8 tx_seq, u8 sar)
{ {
struct sock *sk = chan->sk;
struct sk_buff *next_skb; struct sk_buff *next_skb;
struct l2cap_pinfo *pi = l2cap_pi(sk);
int tx_seq_offset, next_tx_seq_offset; int tx_seq_offset, next_tx_seq_offset;
bt_cb(skb)->tx_seq = tx_seq; bt_cb(skb)->tx_seq = tx_seq;
...@@ -2829,7 +2827,7 @@ static int l2cap_add_to_srej_queue(struct sock *sk, struct sk_buff *skb, u8 tx_s ...@@ -2829,7 +2827,7 @@ static int l2cap_add_to_srej_queue(struct sock *sk, struct sk_buff *skb, u8 tx_s
return 0; return 0;
} }
tx_seq_offset = (tx_seq - pi->buffer_seq) % 64; tx_seq_offset = (tx_seq - chan->buffer_seq) % 64;
if (tx_seq_offset < 0) if (tx_seq_offset < 0)
tx_seq_offset += 64; tx_seq_offset += 64;
...@@ -2838,7 +2836,7 @@ static int l2cap_add_to_srej_queue(struct sock *sk, struct sk_buff *skb, u8 tx_s ...@@ -2838,7 +2836,7 @@ static int l2cap_add_to_srej_queue(struct sock *sk, struct sk_buff *skb, u8 tx_s
return -EINVAL; return -EINVAL;
next_tx_seq_offset = (bt_cb(next_skb)->tx_seq - next_tx_seq_offset = (bt_cb(next_skb)->tx_seq -
pi->buffer_seq) % 64; chan->buffer_seq) % 64;
if (next_tx_seq_offset < 0) if (next_tx_seq_offset < 0)
next_tx_seq_offset += 64; next_tx_seq_offset += 64;
...@@ -2981,13 +2979,13 @@ static int l2cap_try_push_rx_skb(struct l2cap_chan *chan) ...@@ -2981,13 +2979,13 @@ static int l2cap_try_push_rx_skb(struct l2cap_chan *chan)
return -EBUSY; return -EBUSY;
} }
pi->buffer_seq = (pi->buffer_seq + 1) % 64; chan->buffer_seq = (chan->buffer_seq + 1) % 64;
} }
if (!(chan->conn_state & L2CAP_CONN_RNR_SENT)) if (!(chan->conn_state & L2CAP_CONN_RNR_SENT))
goto done; goto done;
control = pi->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT; control = chan->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT;
control |= L2CAP_SUPER_RCV_READY | L2CAP_CTRL_POLL; control |= L2CAP_SUPER_RCV_READY | L2CAP_CTRL_POLL;
l2cap_send_sframe(chan, control); l2cap_send_sframe(chan, control);
l2cap_pi(sk)->retry_count = 1; l2cap_pi(sk)->retry_count = 1;
...@@ -3069,7 +3067,7 @@ static int l2cap_push_rx_skb(struct l2cap_chan *chan, struct sk_buff *skb, u16 c ...@@ -3069,7 +3067,7 @@ static int l2cap_push_rx_skb(struct l2cap_chan *chan, struct sk_buff *skb, u16 c
err = l2cap_ertm_reassembly_sdu(chan, skb, control); err = l2cap_ertm_reassembly_sdu(chan, skb, control);
if (err >= 0) { if (err >= 0) {
pi->buffer_seq = (pi->buffer_seq + 1) % 64; chan->buffer_seq = (chan->buffer_seq + 1) % 64;
return err; return err;
} }
...@@ -3080,7 +3078,7 @@ static int l2cap_push_rx_skb(struct l2cap_chan *chan, struct sk_buff *skb, u16 c ...@@ -3080,7 +3078,7 @@ static int l2cap_push_rx_skb(struct l2cap_chan *chan, struct sk_buff *skb, u16 c
bt_cb(skb)->sar = control >> L2CAP_CTRL_SAR_SHIFT; bt_cb(skb)->sar = control >> L2CAP_CTRL_SAR_SHIFT;
__skb_queue_tail(BUSY_QUEUE(sk), skb); __skb_queue_tail(BUSY_QUEUE(sk), skb);
sctrl = pi->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT; sctrl = chan->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT;
sctrl |= L2CAP_SUPER_RCV_NOT_READY; sctrl |= L2CAP_SUPER_RCV_NOT_READY;
l2cap_send_sframe(chan, sctrl); l2cap_send_sframe(chan, sctrl);
...@@ -3200,8 +3198,8 @@ static void l2cap_check_srej_gap(struct l2cap_chan *chan, u8 tx_seq) ...@@ -3200,8 +3198,8 @@ static void l2cap_check_srej_gap(struct l2cap_chan *chan, u8 tx_seq)
skb = skb_dequeue(SREJ_QUEUE(sk)); skb = skb_dequeue(SREJ_QUEUE(sk));
control = bt_cb(skb)->sar << L2CAP_CTRL_SAR_SHIFT; control = bt_cb(skb)->sar << L2CAP_CTRL_SAR_SHIFT;
l2cap_ertm_reassembly_sdu(chan, skb, control); l2cap_ertm_reassembly_sdu(chan, skb, control);
l2cap_pi(sk)->buffer_seq_srej = chan->buffer_seq_srej =
(l2cap_pi(sk)->buffer_seq_srej + 1) % 64; (chan->buffer_seq_srej + 1) % 64;
tx_seq = (tx_seq + 1) % 64; tx_seq = (tx_seq + 1) % 64;
} }
} }
...@@ -3229,21 +3227,20 @@ static void l2cap_resend_srejframe(struct l2cap_chan *chan, u8 tx_seq) ...@@ -3229,21 +3227,20 @@ static void l2cap_resend_srejframe(struct l2cap_chan *chan, u8 tx_seq)
static void l2cap_send_srejframe(struct l2cap_chan *chan, u8 tx_seq) static void l2cap_send_srejframe(struct l2cap_chan *chan, u8 tx_seq)
{ {
struct sock *sk = chan->sk; struct sock *sk = chan->sk;
struct l2cap_pinfo *pi = l2cap_pi(sk);
struct srej_list *new; struct srej_list *new;
u16 control; u16 control;
while (tx_seq != pi->expected_tx_seq) { while (tx_seq != chan->expected_tx_seq) {
control = L2CAP_SUPER_SELECT_REJECT; control = L2CAP_SUPER_SELECT_REJECT;
control |= pi->expected_tx_seq << L2CAP_CTRL_REQSEQ_SHIFT; control |= chan->expected_tx_seq << L2CAP_CTRL_REQSEQ_SHIFT;
l2cap_send_sframe(chan, control); l2cap_send_sframe(chan, control);
new = kzalloc(sizeof(struct srej_list), GFP_ATOMIC); new = kzalloc(sizeof(struct srej_list), GFP_ATOMIC);
new->tx_seq = pi->expected_tx_seq; new->tx_seq = chan->expected_tx_seq;
pi->expected_tx_seq = (pi->expected_tx_seq + 1) % 64; chan->expected_tx_seq = (chan->expected_tx_seq + 1) % 64;
list_add_tail(&new->list, SREJ_LIST(sk)); list_add_tail(&new->list, SREJ_LIST(sk));
} }
pi->expected_tx_seq = (pi->expected_tx_seq + 1) % 64; chan->expected_tx_seq = (chan->expected_tx_seq + 1) % 64;
} }
static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_control, struct sk_buff *skb) static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_control, struct sk_buff *skb)
...@@ -3268,13 +3265,13 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont ...@@ -3268,13 +3265,13 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont
chan->conn_state &= ~L2CAP_CONN_WAIT_F; chan->conn_state &= ~L2CAP_CONN_WAIT_F;
} }
pi->expected_ack_seq = req_seq; chan->expected_ack_seq = req_seq;
l2cap_drop_acked_frames(sk); l2cap_drop_acked_frames(chan);
if (tx_seq == pi->expected_tx_seq) if (tx_seq == chan->expected_tx_seq)
goto expected; goto expected;
tx_seq_offset = (tx_seq - pi->buffer_seq) % 64; tx_seq_offset = (tx_seq - chan->buffer_seq) % 64;
if (tx_seq_offset < 0) if (tx_seq_offset < 0)
tx_seq_offset += 64; tx_seq_offset += 64;
...@@ -3293,14 +3290,14 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont ...@@ -3293,14 +3290,14 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont
first = list_first_entry(SREJ_LIST(sk), first = list_first_entry(SREJ_LIST(sk),
struct srej_list, list); struct srej_list, list);
if (tx_seq == first->tx_seq) { if (tx_seq == first->tx_seq) {
l2cap_add_to_srej_queue(sk, skb, tx_seq, sar); l2cap_add_to_srej_queue(chan, skb, tx_seq, sar);
l2cap_check_srej_gap(chan, tx_seq); l2cap_check_srej_gap(chan, tx_seq);
list_del(&first->list); list_del(&first->list);
kfree(first); kfree(first);
if (list_empty(SREJ_LIST(sk))) { if (list_empty(SREJ_LIST(sk))) {
pi->buffer_seq = pi->buffer_seq_srej; chan->buffer_seq = chan->buffer_seq_srej;
chan->conn_state &= ~L2CAP_CONN_SREJ_SENT; chan->conn_state &= ~L2CAP_CONN_SREJ_SENT;
l2cap_send_ack(chan); l2cap_send_ack(chan);
BT_DBG("sk %p, Exit SREJ_SENT", sk); BT_DBG("sk %p, Exit SREJ_SENT", sk);
...@@ -3309,7 +3306,7 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont ...@@ -3309,7 +3306,7 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont
struct srej_list *l; struct srej_list *l;
/* duplicated tx_seq */ /* duplicated tx_seq */
if (l2cap_add_to_srej_queue(sk, skb, tx_seq, sar) < 0) if (l2cap_add_to_srej_queue(chan, skb, tx_seq, sar) < 0)
goto drop; goto drop;
list_for_each_entry(l, SREJ_LIST(sk), list) { list_for_each_entry(l, SREJ_LIST(sk), list) {
...@@ -3322,7 +3319,7 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont ...@@ -3322,7 +3319,7 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont
} }
} else { } else {
expected_tx_seq_offset = expected_tx_seq_offset =
(pi->expected_tx_seq - pi->buffer_seq) % 64; (chan->expected_tx_seq - chan->buffer_seq) % 64;
if (expected_tx_seq_offset < 0) if (expected_tx_seq_offset < 0)
expected_tx_seq_offset += 64; expected_tx_seq_offset += 64;
...@@ -3335,11 +3332,11 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont ...@@ -3335,11 +3332,11 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont
BT_DBG("sk %p, Enter SREJ", sk); BT_DBG("sk %p, Enter SREJ", sk);
INIT_LIST_HEAD(SREJ_LIST(sk)); INIT_LIST_HEAD(SREJ_LIST(sk));
pi->buffer_seq_srej = pi->buffer_seq; chan->buffer_seq_srej = chan->buffer_seq;
__skb_queue_head_init(SREJ_QUEUE(sk)); __skb_queue_head_init(SREJ_QUEUE(sk));
__skb_queue_head_init(BUSY_QUEUE(sk)); __skb_queue_head_init(BUSY_QUEUE(sk));
l2cap_add_to_srej_queue(sk, skb, tx_seq, sar); l2cap_add_to_srej_queue(chan, skb, tx_seq, sar);
chan->conn_state |= L2CAP_CONN_SEND_PBIT; chan->conn_state |= L2CAP_CONN_SEND_PBIT;
...@@ -3350,7 +3347,7 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont ...@@ -3350,7 +3347,7 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont
return 0; return 0;
expected: expected:
pi->expected_tx_seq = (pi->expected_tx_seq + 1) % 64; chan->expected_tx_seq = (chan->expected_tx_seq + 1) % 64;
if (chan->conn_state & L2CAP_CONN_SREJ_SENT) { if (chan->conn_state & L2CAP_CONN_SREJ_SENT) {
bt_cb(skb)->tx_seq = tx_seq; bt_cb(skb)->tx_seq = tx_seq;
...@@ -3391,8 +3388,8 @@ static inline void l2cap_data_channel_rrframe(struct l2cap_chan *chan, u16 rx_co ...@@ -3391,8 +3388,8 @@ static inline void l2cap_data_channel_rrframe(struct l2cap_chan *chan, u16 rx_co
BT_DBG("sk %p, req_seq %d ctrl 0x%4.4x", sk, __get_reqseq(rx_control), BT_DBG("sk %p, req_seq %d ctrl 0x%4.4x", sk, __get_reqseq(rx_control),
rx_control); rx_control);
pi->expected_ack_seq = __get_reqseq(rx_control); chan->expected_ack_seq = __get_reqseq(rx_control);
l2cap_drop_acked_frames(sk); l2cap_drop_acked_frames(chan);
if (rx_control & L2CAP_CTRL_POLL) { if (rx_control & L2CAP_CTRL_POLL) {
chan->conn_state |= L2CAP_CONN_SEND_FBIT; chan->conn_state |= L2CAP_CONN_SEND_FBIT;
...@@ -3430,15 +3427,14 @@ static inline void l2cap_data_channel_rrframe(struct l2cap_chan *chan, u16 rx_co ...@@ -3430,15 +3427,14 @@ static inline void l2cap_data_channel_rrframe(struct l2cap_chan *chan, u16 rx_co
static inline void l2cap_data_channel_rejframe(struct l2cap_chan *chan, u16 rx_control) static inline void l2cap_data_channel_rejframe(struct l2cap_chan *chan, u16 rx_control)
{ {
struct l2cap_pinfo *pi = l2cap_pi(chan->sk);
u8 tx_seq = __get_reqseq(rx_control); u8 tx_seq = __get_reqseq(rx_control);
BT_DBG("chan %p, req_seq %d ctrl 0x%4.4x", chan, tx_seq, rx_control); BT_DBG("chan %p, req_seq %d ctrl 0x%4.4x", chan, tx_seq, rx_control);
chan->conn_state &= ~L2CAP_CONN_REMOTE_BUSY; chan->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
pi->expected_ack_seq = tx_seq; chan->expected_ack_seq = tx_seq;
l2cap_drop_acked_frames(chan->sk); l2cap_drop_acked_frames(chan);
if (rx_control & L2CAP_CTRL_FINAL) { if (rx_control & L2CAP_CTRL_FINAL) {
if (chan->conn_state & L2CAP_CONN_REJ_ACT) if (chan->conn_state & L2CAP_CONN_REJ_ACT)
...@@ -3462,8 +3458,8 @@ static inline void l2cap_data_channel_srejframe(struct l2cap_chan *chan, u16 rx_ ...@@ -3462,8 +3458,8 @@ static inline void l2cap_data_channel_srejframe(struct l2cap_chan *chan, u16 rx_
chan->conn_state &= ~L2CAP_CONN_REMOTE_BUSY; chan->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
if (rx_control & L2CAP_CTRL_POLL) { if (rx_control & L2CAP_CTRL_POLL) {
pi->expected_ack_seq = tx_seq; chan->expected_ack_seq = tx_seq;
l2cap_drop_acked_frames(chan->sk); l2cap_drop_acked_frames(chan);
chan->conn_state |= L2CAP_CONN_SEND_FBIT; chan->conn_state |= L2CAP_CONN_SEND_FBIT;
l2cap_retransmit_one_frame(chan, tx_seq); l2cap_retransmit_one_frame(chan, tx_seq);
...@@ -3497,8 +3493,8 @@ static inline void l2cap_data_channel_rnrframe(struct l2cap_chan *chan, u16 rx_c ...@@ -3497,8 +3493,8 @@ static inline void l2cap_data_channel_rnrframe(struct l2cap_chan *chan, u16 rx_c
BT_DBG("chan %p, req_seq %d ctrl 0x%4.4x", chan, tx_seq, rx_control); BT_DBG("chan %p, req_seq %d ctrl 0x%4.4x", chan, tx_seq, rx_control);
chan->conn_state |= L2CAP_CONN_REMOTE_BUSY; chan->conn_state |= L2CAP_CONN_REMOTE_BUSY;
pi->expected_ack_seq = tx_seq; chan->expected_ack_seq = tx_seq;
l2cap_drop_acked_frames(chan->sk); l2cap_drop_acked_frames(chan);
if (rx_control & L2CAP_CTRL_POLL) if (rx_control & L2CAP_CTRL_POLL)
chan->conn_state |= L2CAP_CONN_SEND_FBIT; chan->conn_state |= L2CAP_CONN_SEND_FBIT;
...@@ -3584,12 +3580,12 @@ static int l2cap_ertm_data_rcv(struct sock *sk, struct sk_buff *skb) ...@@ -3584,12 +3580,12 @@ static int l2cap_ertm_data_rcv(struct sock *sk, struct sk_buff *skb)
} }
req_seq = __get_reqseq(control); req_seq = __get_reqseq(control);
req_seq_offset = (req_seq - pi->expected_ack_seq) % 64; req_seq_offset = (req_seq - chan->expected_ack_seq) % 64;
if (req_seq_offset < 0) if (req_seq_offset < 0)
req_seq_offset += 64; req_seq_offset += 64;
next_tx_seq_offset = next_tx_seq_offset =
(pi->next_tx_seq - pi->expected_ack_seq) % 64; (chan->next_tx_seq - chan->expected_ack_seq) % 64;
if (next_tx_seq_offset < 0) if (next_tx_seq_offset < 0)
next_tx_seq_offset += 64; next_tx_seq_offset += 64;
...@@ -3689,10 +3685,10 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk ...@@ -3689,10 +3685,10 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk
tx_seq = __get_txseq(control); tx_seq = __get_txseq(control);
if (pi->expected_tx_seq == tx_seq) if (chan->expected_tx_seq == tx_seq)
pi->expected_tx_seq = (pi->expected_tx_seq + 1) % 64; chan->expected_tx_seq = (chan->expected_tx_seq + 1) % 64;
else else
pi->expected_tx_seq = (tx_seq + 1) % 64; chan->expected_tx_seq = (tx_seq + 1) % 64;
l2cap_streaming_reassembly_sdu(chan, skb, control); l2cap_streaming_reassembly_sdu(chan, skb, control);
......
net/bluetooth/l2cap_sock.c
View file @ 42e5c802
...@@ -777,7 +777,7 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms ...@@ -777,7 +777,7 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms
} }
if (pi->mode == L2CAP_MODE_STREAMING) { if (pi->mode == L2CAP_MODE_STREAMING) {
l2cap_streaming_send(sk); l2cap_streaming_send(pi->chan);
err = len; err = len;
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7