Skip to content

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

Bluetooth: Move srej and busy queues to struct l2cap_chan 

As part of the moving channel stuff to l2cap_chan.
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent e92c8e70
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 28 deletions
include/net/bluetooth/l2cap.h
View file @ f1c6775b
...@@ -309,6 +309,8 @@ struct l2cap_chan { ...@@ -309,6 +309,8 @@ struct l2cap_chan {
struct timer_list retrans_timer; struct timer_list retrans_timer;
struct timer_list monitor_timer; struct timer_list monitor_timer;
struct timer_list ack_timer; struct timer_list ack_timer;
struct sk_buff_head srej_q;
struct sk_buff_head busy_q;
struct list_head list; struct list_head list;
}; };
...@@ -347,8 +349,6 @@ struct l2cap_conn { ...@@ -347,8 +349,6 @@ struct l2cap_conn {
/* ----- L2CAP socket info ----- */ /* ----- L2CAP socket info ----- */
#define l2cap_pi(sk) ((struct l2cap_pinfo *) sk) #define l2cap_pi(sk) ((struct l2cap_pinfo *) sk)
#define TX_QUEUE(sk) (&l2cap_pi(sk)->tx_queue) #define TX_QUEUE(sk) (&l2cap_pi(sk)->tx_queue)
#define SREJ_QUEUE(sk) (&l2cap_pi(sk)->srej_queue)
#define BUSY_QUEUE(sk) (&l2cap_pi(sk)->busy_queue)
#define SREJ_LIST(sk) (&l2cap_pi(sk)->srej_l.list) #define SREJ_LIST(sk) (&l2cap_pi(sk)->srej_l.list)
struct srej_list { struct srej_list {
...@@ -384,8 +384,6 @@ struct l2cap_pinfo { ...@@ -384,8 +384,6 @@ struct l2cap_pinfo {
__le16 sport; __le16 sport;
struct sk_buff_head tx_queue; struct sk_buff_head tx_queue;
struct sk_buff_head srej_queue;
struct sk_buff_head busy_queue;
struct work_struct busy_work; struct work_struct busy_work;
struct srej_list srej_l; struct srej_list srej_l;
struct l2cap_conn *conn; struct l2cap_conn *conn;
......
net/bluetooth/l2cap_core.c
View file @ f1c6775b
...@@ -245,8 +245,8 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err) ...@@ -245,8 +245,8 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err)
del_timer(&chan->monitor_timer); del_timer(&chan->monitor_timer);
del_timer(&chan->ack_timer); del_timer(&chan->ack_timer);
skb_queue_purge(SREJ_QUEUE(sk)); skb_queue_purge(&chan->srej_q);
skb_queue_purge(BUSY_QUEUE(sk)); skb_queue_purge(&chan->busy_q);
list_for_each_entry_safe(l, tmp, SREJ_LIST(sk), list) { list_for_each_entry_safe(l, tmp, SREJ_LIST(sk), list) {
list_del(&l->list); list_del(&l->list);
...@@ -1588,8 +1588,8 @@ static inline void l2cap_ertm_init(struct l2cap_chan *chan) ...@@ -1588,8 +1588,8 @@ static inline void l2cap_ertm_init(struct l2cap_chan *chan)
(unsigned long) chan); (unsigned long) chan);
setup_timer(&chan->ack_timer, l2cap_ack_timeout, (unsigned long) chan); setup_timer(&chan->ack_timer, l2cap_ack_timeout, (unsigned long) chan);
__skb_queue_head_init(SREJ_QUEUE(sk)); skb_queue_head_init(&chan->srej_q);
__skb_queue_head_init(BUSY_QUEUE(sk)); skb_queue_head_init(&chan->busy_q);
INIT_WORK(&l2cap_pi(sk)->busy_work, l2cap_busy_work); INIT_WORK(&l2cap_pi(sk)->busy_work, l2cap_busy_work);
...@@ -2815,16 +2815,15 @@ static inline void l2cap_send_i_or_rr_or_rnr(struct l2cap_chan *chan) ...@@ -2815,16 +2815,15 @@ static inline void l2cap_send_i_or_rr_or_rnr(struct l2cap_chan *chan)
static int l2cap_add_to_srej_queue(struct l2cap_chan *chan, 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;
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;
bt_cb(skb)->sar = sar; bt_cb(skb)->sar = sar;
next_skb = skb_peek(SREJ_QUEUE(sk)); next_skb = skb_peek(&chan->srej_q);
if (!next_skb) { if (!next_skb) {
__skb_queue_tail(SREJ_QUEUE(sk), skb); __skb_queue_tail(&chan->srej_q, skb);
return 0; return 0;
} }
...@@ -2842,16 +2841,16 @@ static int l2cap_add_to_srej_queue(struct l2cap_chan *chan, struct sk_buff *skb, ...@@ -2842,16 +2841,16 @@ static int l2cap_add_to_srej_queue(struct l2cap_chan *chan, struct sk_buff *skb,
next_tx_seq_offset += 64; next_tx_seq_offset += 64;
if (next_tx_seq_offset > tx_seq_offset) { if (next_tx_seq_offset > tx_seq_offset) {
__skb_queue_before(SREJ_QUEUE(sk), next_skb, skb); __skb_queue_before(&chan->srej_q, next_skb, skb);
return 0; return 0;
} }
if (skb_queue_is_last(SREJ_QUEUE(sk), next_skb)) if (skb_queue_is_last(&chan->srej_q, next_skb))
break; break;
} while ((next_skb = skb_queue_next(SREJ_QUEUE(sk), next_skb))); } while ((next_skb = skb_queue_next(&chan->srej_q, next_skb)));
__skb_queue_tail(SREJ_QUEUE(sk), skb); __skb_queue_tail(&chan->srej_q, skb);
return 0; return 0;
} }
...@@ -2971,11 +2970,11 @@ static int l2cap_try_push_rx_skb(struct l2cap_chan *chan) ...@@ -2971,11 +2970,11 @@ static int l2cap_try_push_rx_skb(struct l2cap_chan *chan)
u16 control; u16 control;
int err; int err;
while ((skb = skb_dequeue(BUSY_QUEUE(sk)))) { while ((skb = skb_dequeue(&chan->busy_q))) {
control = bt_cb(skb)->sar << L2CAP_CTRL_SAR_SHIFT; control = bt_cb(skb)->sar << L2CAP_CTRL_SAR_SHIFT;
err = l2cap_ertm_reassembly_sdu(chan, skb, control); err = l2cap_ertm_reassembly_sdu(chan, skb, control);
if (err < 0) { if (err < 0) {
skb_queue_head(BUSY_QUEUE(sk), skb); skb_queue_head(&chan->busy_q, skb);
return -EBUSY; return -EBUSY;
} }
...@@ -3016,7 +3015,7 @@ static void l2cap_busy_work(struct work_struct *work) ...@@ -3016,7 +3015,7 @@ static void l2cap_busy_work(struct work_struct *work)
lock_sock(sk); lock_sock(sk);
add_wait_queue(sk_sleep(sk), &wait); add_wait_queue(sk_sleep(sk), &wait);
while ((skb = skb_peek(BUSY_QUEUE(sk)))) { while ((skb = skb_peek(&pi->chan->busy_q))) {
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
if (n_tries++ > L2CAP_LOCAL_BUSY_TRIES) { if (n_tries++ > L2CAP_LOCAL_BUSY_TRIES) {
...@@ -3059,7 +3058,7 @@ static int l2cap_push_rx_skb(struct l2cap_chan *chan, struct sk_buff *skb, u16 c ...@@ -3059,7 +3058,7 @@ static int l2cap_push_rx_skb(struct l2cap_chan *chan, struct sk_buff *skb, u16 c
if (chan->conn_state & L2CAP_CONN_LOCAL_BUSY) { if (chan->conn_state & L2CAP_CONN_LOCAL_BUSY) {
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(&chan->busy_q, skb);
return l2cap_try_push_rx_skb(chan); return l2cap_try_push_rx_skb(chan);
...@@ -3076,7 +3075,7 @@ static int l2cap_push_rx_skb(struct l2cap_chan *chan, struct sk_buff *skb, u16 c ...@@ -3076,7 +3075,7 @@ static int l2cap_push_rx_skb(struct l2cap_chan *chan, struct sk_buff *skb, u16 c
chan->conn_state |= L2CAP_CONN_LOCAL_BUSY; chan->conn_state |= L2CAP_CONN_LOCAL_BUSY;
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(&chan->busy_q, skb);
sctrl = chan->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;
...@@ -3187,15 +3186,14 @@ static int l2cap_streaming_reassembly_sdu(struct l2cap_chan *chan, struct sk_buf ...@@ -3187,15 +3186,14 @@ static int l2cap_streaming_reassembly_sdu(struct l2cap_chan *chan, struct sk_buf
static void l2cap_check_srej_gap(struct l2cap_chan *chan, u8 tx_seq) static void l2cap_check_srej_gap(struct l2cap_chan *chan, u8 tx_seq)
{ {
struct sock *sk = chan->sk;
struct sk_buff *skb; struct sk_buff *skb;
u16 control; u16 control;
while ((skb = skb_peek(SREJ_QUEUE(sk)))) { while ((skb = skb_peek(&chan->srej_q))) {
if (bt_cb(skb)->tx_seq != tx_seq) if (bt_cb(skb)->tx_seq != tx_seq)
break; break;
skb = skb_dequeue(SREJ_QUEUE(sk)); skb = skb_dequeue(&chan->srej_q);
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);
chan->buffer_seq_srej = chan->buffer_seq_srej =
...@@ -3334,8 +3332,8 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont ...@@ -3334,8 +3332,8 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont
INIT_LIST_HEAD(SREJ_LIST(sk)); INIT_LIST_HEAD(SREJ_LIST(sk));
chan->buffer_seq_srej = chan->buffer_seq; chan->buffer_seq_srej = chan->buffer_seq;
__skb_queue_head_init(SREJ_QUEUE(sk)); __skb_queue_head_init(&chan->srej_q);
__skb_queue_head_init(BUSY_QUEUE(sk)); __skb_queue_head_init(&chan->busy_q);
l2cap_add_to_srej_queue(chan, 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;
...@@ -3352,7 +3350,7 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont ...@@ -3352,7 +3350,7 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont
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;
bt_cb(skb)->sar = sar; bt_cb(skb)->sar = sar;
__skb_queue_tail(SREJ_QUEUE(sk), skb); __skb_queue_tail(&chan->srej_q, skb);
return 0; return 0;
} }
......
net/bluetooth/l2cap_sock.c
View file @ f1c6775b
...@@ -1018,8 +1018,6 @@ void l2cap_sock_init(struct sock *sk, struct sock *parent) ...@@ -1018,8 +1018,6 @@ void l2cap_sock_init(struct sock *sk, struct sock *parent)
/* Default config options */ /* Default config options */
pi->flush_to = L2CAP_DEFAULT_FLUSH_TO; pi->flush_to = L2CAP_DEFAULT_FLUSH_TO;
skb_queue_head_init(TX_QUEUE(sk)); skb_queue_head_init(TX_QUEUE(sk));
skb_queue_head_init(SREJ_QUEUE(sk));
skb_queue_head_init(BUSY_QUEUE(sk));
INIT_LIST_HEAD(SREJ_LIST(sk)); INIT_LIST_HEAD(SREJ_LIST(sk));
} }
......
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