Bluetooth: Move SREJ list to struct l2cap_chan

As part of moving all the Channel related operation to struct l2cap_chan. Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

Bluetooth: Move SREJ list to struct l2cap_chan
As part of moving all the Channel related operation to struct l2cap_chan. Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Gustavo F. Padovan
1 parent 2ead70b839
Showing 3 changed files with 17 additions and 19 deletions Side-by-side Diff
include/net/bluetooth/l2cap.h
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
@@ -277,6 +277,11 @@
 #define L2CAP_CONN_PARAM_REJECTED	0x0001
  
 /* ----- L2CAP channels and connections ----- */
+struct srej_list {
+	__u8	tx_seq;
+	struct list_head list;
+};
+
 struct l2cap_chan {
 	struct sock *sk;
 	__u8		ident;
@@ -312,6 +317,7 @@
 	struct sk_buff_head	srej_q;
 	struct sk_buff_head	busy_q;
 	struct work_struct	busy_work;
+	struct list_head	srej_l;
  
 	struct list_head list;
 };
  
@@ -350,13 +356,7 @@
 /* ----- L2CAP socket info ----- */
 #define l2cap_pi(sk) ((struct l2cap_pinfo *) sk)
 #define TX_QUEUE(sk) (&l2cap_pi(sk)->tx_queue)
-#define SREJ_LIST(sk) (&l2cap_pi(sk)->srej_l.list)
  
-struct srej_list {
-	__u8	tx_seq;
-	struct list_head list;
-};
-
 struct l2cap_pinfo {
 	struct bt_sock	bt;
 	__le16		psm;
@@ -385,7 +385,6 @@
 	__le16		sport;
  
 	struct sk_buff_head	tx_queue;
-	struct srej_list	srej_l;
 	struct l2cap_conn	*conn;
 	struct l2cap_chan	*chan;
 };
@@ -252,7 +252,7 @@
 		skb_queue_purge(&chan->srej_q);
 		skb_queue_purge(&chan->busy_q);
  
-		list_for_each_entry_safe(l, tmp, SREJ_LIST(sk), list) {
+		list_for_each_entry_safe(l, tmp, &chan->srej_l, list) {
 			list_del(&l->list);
 			kfree(l);
 		}
@@ -1205,7 +1205,7 @@
 	control = L2CAP_SUPER_SELECT_REJECT;
 	control |= L2CAP_CTRL_FINAL;
  
-	tail = list_entry(SREJ_LIST(chan->sk)->prev, struct srej_list, list);
+	tail = list_entry((&chan->srej_l)->prev, struct srej_list, list);
 	control |= tail->tx_seq << L2CAP_CTRL_REQSEQ_SHIFT;
  
 	l2cap_send_sframe(chan, control);
@@ -1596,6 +1596,8 @@
 	skb_queue_head_init(&chan->srej_q);
 	skb_queue_head_init(&chan->busy_q);
  
+	INIT_LIST_HEAD(&chan->srej_l);
+
 	INIT_WORK(&chan->busy_work, l2cap_busy_work);
  
 	sk->sk_backlog_rcv = l2cap_ertm_data_rcv;
  
@@ -3207,11 +3209,10 @@
  
 static void l2cap_resend_srejframe(struct l2cap_chan *chan, u8 tx_seq)
 {
-	struct sock *sk = chan->sk;
 	struct srej_list *l, *tmp;
 	u16 control;
  
-	list_for_each_entry_safe(l, tmp, SREJ_LIST(sk), list) {
+	list_for_each_entry_safe(l, tmp, &chan->srej_l, list) {
 		if (l->tx_seq == tx_seq) {
 			list_del(&l->list);
 			kfree(l);
  
@@ -3221,13 +3222,12 @@
 		control |= l->tx_seq << L2CAP_CTRL_REQSEQ_SHIFT;
 		l2cap_send_sframe(chan, control);
 		list_del(&l->list);
-		list_add_tail(&l->list, SREJ_LIST(sk));
+		list_add_tail(&l->list, &chan->srej_l);
 	}
 }
  
 static void l2cap_send_srejframe(struct l2cap_chan *chan, u8 tx_seq)
 {
-	struct sock *sk = chan->sk;
 	struct srej_list *new;
 	u16 control;
  
@@ -3239,7 +3239,7 @@
 		new = kzalloc(sizeof(struct srej_list), GFP_ATOMIC);
 		new->tx_seq = chan->expected_tx_seq;
 		chan->expected_tx_seq = (chan->expected_tx_seq + 1) % 64;
-		list_add_tail(&new->list, SREJ_LIST(sk));
+		list_add_tail(&new->list, &chan->srej_l);
 	}
 	chan->expected_tx_seq = (chan->expected_tx_seq + 1) % 64;
 }
@@ -3288,7 +3288,7 @@
 	if (chan->conn_state & L2CAP_CONN_SREJ_SENT) {
 		struct srej_list *first;
  
-		first = list_first_entry(SREJ_LIST(sk),
+		first = list_first_entry(&chan->srej_l,
 				struct srej_list, list);
 		if (tx_seq == first->tx_seq) {
 			l2cap_add_to_srej_queue(chan, skb, tx_seq, sar);
@@ -3297,7 +3297,7 @@
 			list_del(&first->list);
 			kfree(first);
  
-			if (list_empty(SREJ_LIST(sk))) {
+			if (list_empty(&chan->srej_l)) {
 				chan->buffer_seq = chan->buffer_seq_srej;
 				chan->conn_state &= ~L2CAP_CONN_SREJ_SENT;
 				l2cap_send_ack(chan);
@@ -3310,7 +3310,7 @@
 			if (l2cap_add_to_srej_queue(chan, skb, tx_seq, sar) < 0)
 				goto drop;
  
-			list_for_each_entry(l, SREJ_LIST(sk), list) {
+			list_for_each_entry(l, &chan->srej_l, list) {
 				if (l->tx_seq == tx_seq) {
 					l2cap_resend_srejframe(chan, tx_seq);
 					return 0;
@@ -3332,7 +3332,7 @@
  
 		BT_DBG("sk %p, Enter SREJ", sk);
  
-		INIT_LIST_HEAD(SREJ_LIST(sk));
+		INIT_LIST_HEAD(&chan->srej_l);
 		chan->buffer_seq_srej = chan->buffer_seq;
  
 		__skb_queue_head_init(&chan->srej_q);
@@ -1018,7 +1018,6 @@
 	/* Default config options */
 	pi->flush_to = L2CAP_DEFAULT_FLUSH_TO;
 	skb_queue_head_init(TX_QUEUE(sk));
-	INIT_LIST_HEAD(SREJ_LIST(sk));
 }
  
 static struct proto l2cap_proto = {
...	...	@@ -277,6 +277,11 @@
277	277	#define L2CAP_CONN_PARAM_REJECTED 0x0001
278	278
279	279	/* ----- L2CAP channels and connections ----- */
	280	+struct srej_list {
	281	+ __u8 tx_seq;
	282	+ struct list_head list;
	283	+};
	284	+
280	285	struct l2cap_chan {
281	286	struct sock *sk;
282	287	__u8 ident;
...	...	@@ -312,6 +317,7 @@
312	317	struct sk_buff_head srej_q;
313	318	struct sk_buff_head busy_q;
314	319	struct work_struct busy_work;
	320	+ struct list_head srej_l;
315	321
316	322	struct list_head list;
317	323	};
318	324
...	...	@@ -350,13 +356,7 @@
350	356	/* ----- L2CAP socket info ----- */
351	357	#define l2cap_pi(sk) ((struct l2cap_pinfo *) sk)
352	358	#define TX_QUEUE(sk) (&l2cap_pi(sk)->tx_queue)
353		-#define SREJ_LIST(sk) (&l2cap_pi(sk)->srej_l.list)
354	359
355		-struct srej_list {
356		- __u8 tx_seq;
357		- struct list_head list;
358		-};
359		-
360	360	struct l2cap_pinfo {
361	361	struct bt_sock bt;
362	362	__le16 psm;
...	...	@@ -385,7 +385,6 @@
385	385	__le16 sport;
386	386
387	387	struct sk_buff_head tx_queue;
388		- struct srej_list srej_l;
389	388	struct l2cap_conn *conn;
390	389	struct l2cap_chan *chan;
391	390	};
...	...	@@ -252,7 +252,7 @@
252	252	skb_queue_purge(&chan->srej_q);
253	253	skb_queue_purge(&chan->busy_q);
254	254
255		- list_for_each_entry_safe(l, tmp, SREJ_LIST(sk), list) {
	255	+ list_for_each_entry_safe(l, tmp, &chan->srej_l, list) {
256	256	list_del(&l->list);
257	257	kfree(l);
258	258	}
...	...	@@ -1205,7 +1205,7 @@
1205	1205	control = L2CAP_SUPER_SELECT_REJECT;
1206	1206	control \|= L2CAP_CTRL_FINAL;
1207	1207
1208		- tail = list_entry(SREJ_LIST(chan->sk)->prev, struct srej_list, list);
	1208	+ tail = list_entry((&chan->srej_l)->prev, struct srej_list, list);
1209	1209	control \|= tail->tx_seq << L2CAP_CTRL_REQSEQ_SHIFT;
1210	1210
1211	1211	l2cap_send_sframe(chan, control);
...	...	@@ -1596,6 +1596,8 @@
1596	1596	skb_queue_head_init(&chan->srej_q);
1597	1597	skb_queue_head_init(&chan->busy_q);
1598	1598
	1599	+ INIT_LIST_HEAD(&chan->srej_l);
	1600	+
1599	1601	INIT_WORK(&chan->busy_work, l2cap_busy_work);
1600	1602
1601	1603	sk->sk_backlog_rcv = l2cap_ertm_data_rcv;
1602	1604
...	...	@@ -3207,11 +3209,10 @@
3207	3209
3208	3210	static void l2cap_resend_srejframe(struct l2cap_chan *chan, u8 tx_seq)
3209	3211	{
3210		- struct sock *sk = chan->sk;
3211	3212	struct srej_list l, tmp;
3212	3213	u16 control;
3213	3214
3214		- list_for_each_entry_safe(l, tmp, SREJ_LIST(sk), list) {
	3215	+ list_for_each_entry_safe(l, tmp, &chan->srej_l, list) {
3215	3216	if (l->tx_seq == tx_seq) {
3216	3217	list_del(&l->list);
3217	3218	kfree(l);
3218	3219
...	...	@@ -3221,13 +3222,12 @@
3221	3222	control \|= l->tx_seq << L2CAP_CTRL_REQSEQ_SHIFT;
3222	3223	l2cap_send_sframe(chan, control);
3223	3224	list_del(&l->list);
3224		- list_add_tail(&l->list, SREJ_LIST(sk));
	3225	+ list_add_tail(&l->list, &chan->srej_l);
3225	3226	}
3226	3227	}
3227	3228
3228	3229	static void l2cap_send_srejframe(struct l2cap_chan *chan, u8 tx_seq)
3229	3230	{
3230		- struct sock *sk = chan->sk;
3231	3231	struct srej_list *new;
3232	3232	u16 control;
3233	3233
...	...	@@ -3239,7 +3239,7 @@
3239	3239	new = kzalloc(sizeof(struct srej_list), GFP_ATOMIC);
3240	3240	new->tx_seq = chan->expected_tx_seq;
3241	3241	chan->expected_tx_seq = (chan->expected_tx_seq + 1) % 64;
3242		- list_add_tail(&new->list, SREJ_LIST(sk));
	3242	+ list_add_tail(&new->list, &chan->srej_l);
3243	3243	}
3244	3244	chan->expected_tx_seq = (chan->expected_tx_seq + 1) % 64;
3245	3245	}
...	...	@@ -3288,7 +3288,7 @@
3288	3288	if (chan->conn_state & L2CAP_CONN_SREJ_SENT) {
3289	3289	struct srej_list *first;
3290	3290
3291		- first = list_first_entry(SREJ_LIST(sk),
	3291	+ first = list_first_entry(&chan->srej_l,
3292	3292	struct srej_list, list);
3293	3293	if (tx_seq == first->tx_seq) {
3294	3294	l2cap_add_to_srej_queue(chan, skb, tx_seq, sar);
...	...	@@ -3297,7 +3297,7 @@
3297	3297	list_del(&first->list);
3298	3298	kfree(first);
3299	3299
3300		- if (list_empty(SREJ_LIST(sk))) {
	3300	+ if (list_empty(&chan->srej_l)) {
3301	3301	chan->buffer_seq = chan->buffer_seq_srej;
3302	3302	chan->conn_state &= ~L2CAP_CONN_SREJ_SENT;
3303	3303	l2cap_send_ack(chan);
...	...	@@ -3310,7 +3310,7 @@
3310	3310	if (l2cap_add_to_srej_queue(chan, skb, tx_seq, sar) < 0)
3311	3311	goto drop;
3312	3312
3313		- list_for_each_entry(l, SREJ_LIST(sk), list) {
	3313	+ list_for_each_entry(l, &chan->srej_l, list) {
3314	3314	if (l->tx_seq == tx_seq) {
3315	3315	l2cap_resend_srejframe(chan, tx_seq);
3316	3316	return 0;
...	...	@@ -3332,7 +3332,7 @@
3332	3332
3333	3333	BT_DBG("sk %p, Enter SREJ", sk);
3334	3334
3335		- INIT_LIST_HEAD(SREJ_LIST(sk));
	3335	+ INIT_LIST_HEAD(&chan->srej_l);
3336	3336	chan->buffer_seq_srej = chan->buffer_seq;
3337	3337
3338	3338	__skb_queue_head_init(&chan->srej_q);
...	...	@@ -1018,7 +1018,6 @@
1018	1018	/* Default config options */
1019	1019	pi->flush_to = L2CAP_DEFAULT_FLUSH_TO;
1020	1020	skb_queue_head_init(TX_QUEUE(sk));
1021		- INIT_LIST_HEAD(SREJ_LIST(sk));
1022	1021	}
1023	1022
1024	1023	static struct proto l2cap_proto = {