Skip to content

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

Bluetooth: Move SDU related vars 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 6a026610
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 41 deletions
include/net/bluetooth/l2cap.h
View file @ 6f61fd47
...@@ -298,6 +298,10 @@ struct l2cap_chan { ...@@ -298,6 +298,10 @@ struct l2cap_chan {
__u8 unacked_frames; __u8 unacked_frames;
__u8 retry_count; __u8 retry_count;
__u8 num_acked; __u8 num_acked;
__u16 sdu_len;
__u16 partial_sdu_len;
struct sk_buff *sdu;
struct list_head list; struct list_head list;
}; };
...@@ -364,10 +368,6 @@ struct l2cap_pinfo { ...@@ -364,10 +368,6 @@ struct l2cap_pinfo {
__u8 conf_state; __u8 conf_state;
__u16 sdu_len;
__u16 partial_sdu_len;
struct sk_buff *sdu;
__u8 tx_win; __u8 tx_win;
__u8 max_tx; __u8 max_tx;
__u8 remote_tx_win; __u8 remote_tx_win;
......
net/bluetooth/l2cap_core.c
View file @ 6f61fd47
...@@ -2875,13 +2875,13 @@ static int l2cap_ertm_reassembly_sdu(struct l2cap_chan *chan, struct sk_buff *sk ...@@ -2875,13 +2875,13 @@ static int l2cap_ertm_reassembly_sdu(struct l2cap_chan *chan, struct sk_buff *sk
if (chan->conn_state & L2CAP_CONN_SAR_SDU) if (chan->conn_state & L2CAP_CONN_SAR_SDU)
goto drop; goto drop;
pi->sdu_len = get_unaligned_le16(skb->data); chan->sdu_len = get_unaligned_le16(skb->data);
if (pi->sdu_len > pi->imtu) if (chan->sdu_len > pi->imtu)
goto disconnect; goto disconnect;
pi->sdu = bt_skb_alloc(pi->sdu_len, GFP_ATOMIC); chan->sdu = bt_skb_alloc(chan->sdu_len, GFP_ATOMIC);
if (!pi->sdu) if (!chan->sdu)
return -ENOMEM; return -ENOMEM;
/* pull sdu_len bytes only after alloc, because of Local Busy /* pull sdu_len bytes only after alloc, because of Local Busy
...@@ -2889,24 +2889,24 @@ static int l2cap_ertm_reassembly_sdu(struct l2cap_chan *chan, struct sk_buff *sk ...@@ -2889,24 +2889,24 @@ static int l2cap_ertm_reassembly_sdu(struct l2cap_chan *chan, struct sk_buff *sk
* only once, i.e., when alloc does not fail */ * only once, i.e., when alloc does not fail */
skb_pull(skb, 2); skb_pull(skb, 2);
memcpy(skb_put(pi->sdu, skb->len), skb->data, skb->len); memcpy(skb_put(chan->sdu, skb->len), skb->data, skb->len);
chan->conn_state |= L2CAP_CONN_SAR_SDU; chan->conn_state |= L2CAP_CONN_SAR_SDU;
pi->partial_sdu_len = skb->len; chan->partial_sdu_len = skb->len;
break; break;
case L2CAP_SDU_CONTINUE: case L2CAP_SDU_CONTINUE:
if (!(chan->conn_state & L2CAP_CONN_SAR_SDU)) if (!(chan->conn_state & L2CAP_CONN_SAR_SDU))
goto disconnect; goto disconnect;
if (!pi->sdu) if (!chan->sdu)
goto disconnect; goto disconnect;
pi->partial_sdu_len += skb->len; chan->partial_sdu_len += skb->len;
if (pi->partial_sdu_len > pi->sdu_len) if (chan->partial_sdu_len > chan->sdu_len)
goto drop; goto drop;
memcpy(skb_put(pi->sdu, skb->len), skb->data, skb->len); memcpy(skb_put(chan->sdu, skb->len), skb->data, skb->len);
break; break;
...@@ -2914,22 +2914,22 @@ static int l2cap_ertm_reassembly_sdu(struct l2cap_chan *chan, struct sk_buff *sk ...@@ -2914,22 +2914,22 @@ static int l2cap_ertm_reassembly_sdu(struct l2cap_chan *chan, struct sk_buff *sk
if (!(chan->conn_state & L2CAP_CONN_SAR_SDU)) if (!(chan->conn_state & L2CAP_CONN_SAR_SDU))
goto disconnect; goto disconnect;
if (!pi->sdu) if (!chan->sdu)
goto disconnect; goto disconnect;
if (!(chan->conn_state & L2CAP_CONN_SAR_RETRY)) { if (!(chan->conn_state & L2CAP_CONN_SAR_RETRY)) {
pi->partial_sdu_len += skb->len; chan->partial_sdu_len += skb->len;
if (pi->partial_sdu_len > pi->imtu) if (chan->partial_sdu_len > pi->imtu)
goto drop; goto drop;
if (pi->partial_sdu_len != pi->sdu_len) if (chan->partial_sdu_len != chan->sdu_len)
goto drop; goto drop;
memcpy(skb_put(pi->sdu, skb->len), skb->data, skb->len); memcpy(skb_put(chan->sdu, skb->len), skb->data, skb->len);
} }
_skb = skb_clone(pi->sdu, GFP_ATOMIC); _skb = skb_clone(chan->sdu, GFP_ATOMIC);
if (!_skb) { if (!_skb) {
chan->conn_state |= L2CAP_CONN_SAR_RETRY; chan->conn_state |= L2CAP_CONN_SAR_RETRY;
return -ENOMEM; return -ENOMEM;
...@@ -2945,7 +2945,7 @@ static int l2cap_ertm_reassembly_sdu(struct l2cap_chan *chan, struct sk_buff *sk ...@@ -2945,7 +2945,7 @@ static int l2cap_ertm_reassembly_sdu(struct l2cap_chan *chan, struct sk_buff *sk
chan->conn_state &= ~L2CAP_CONN_SAR_RETRY; chan->conn_state &= ~L2CAP_CONN_SAR_RETRY;
chan->conn_state &= ~L2CAP_CONN_SAR_SDU; chan->conn_state &= ~L2CAP_CONN_SAR_SDU;
kfree_skb(pi->sdu); kfree_skb(chan->sdu);
break; break;
} }
...@@ -2953,8 +2953,8 @@ static int l2cap_ertm_reassembly_sdu(struct l2cap_chan *chan, struct sk_buff *sk ...@@ -2953,8 +2953,8 @@ static int l2cap_ertm_reassembly_sdu(struct l2cap_chan *chan, struct sk_buff *sk
return 0; return 0;
drop: drop:
kfree_skb(pi->sdu); kfree_skb(chan->sdu);
pi->sdu = NULL; chan->sdu = NULL;
disconnect: disconnect:
l2cap_send_disconn_req(pi->conn, chan->sk, ECONNRESET); l2cap_send_disconn_req(pi->conn, chan->sk, ECONNRESET);
...@@ -3104,7 +3104,7 @@ static int l2cap_streaming_reassembly_sdu(struct l2cap_chan *chan, struct sk_buf ...@@ -3104,7 +3104,7 @@ static int l2cap_streaming_reassembly_sdu(struct l2cap_chan *chan, struct sk_buf
switch (control & L2CAP_CTRL_SAR) { switch (control & L2CAP_CTRL_SAR) {
case L2CAP_SDU_UNSEGMENTED: case L2CAP_SDU_UNSEGMENTED:
if (chan->conn_state & L2CAP_CONN_SAR_SDU) { if (chan->conn_state & L2CAP_CONN_SAR_SDU) {
kfree_skb(pi->sdu); kfree_skb(chan->sdu);
break; break;
} }
...@@ -3116,28 +3116,28 @@ static int l2cap_streaming_reassembly_sdu(struct l2cap_chan *chan, struct sk_buf ...@@ -3116,28 +3116,28 @@ static int l2cap_streaming_reassembly_sdu(struct l2cap_chan *chan, struct sk_buf
case L2CAP_SDU_START: case L2CAP_SDU_START:
if (chan->conn_state & L2CAP_CONN_SAR_SDU) { if (chan->conn_state & L2CAP_CONN_SAR_SDU) {
kfree_skb(pi->sdu); kfree_skb(chan->sdu);
break; break;
} }
pi->sdu_len = get_unaligned_le16(skb->data); chan->sdu_len = get_unaligned_le16(skb->data);
skb_pull(skb, 2); skb_pull(skb, 2);
if (pi->sdu_len > pi->imtu) { if (chan->sdu_len > pi->imtu) {
err = -EMSGSIZE; err = -EMSGSIZE;
break; break;
} }
pi->sdu = bt_skb_alloc(pi->sdu_len, GFP_ATOMIC); chan->sdu = bt_skb_alloc(chan->sdu_len, GFP_ATOMIC);
if (!pi->sdu) { if (!chan->sdu) {
err = -ENOMEM; err = -ENOMEM;
break; break;
} }
memcpy(skb_put(pi->sdu, skb->len), skb->data, skb->len); memcpy(skb_put(chan->sdu, skb->len), skb->data, skb->len);
chan->conn_state |= L2CAP_CONN_SAR_SDU; chan->conn_state |= L2CAP_CONN_SAR_SDU;
pi->partial_sdu_len = skb->len; chan->partial_sdu_len = skb->len;
err = 0; err = 0;
break; break;
...@@ -3145,11 +3145,11 @@ static int l2cap_streaming_reassembly_sdu(struct l2cap_chan *chan, struct sk_buf ...@@ -3145,11 +3145,11 @@ static int l2cap_streaming_reassembly_sdu(struct l2cap_chan *chan, struct sk_buf
if (!(chan->conn_state & L2CAP_CONN_SAR_SDU)) if (!(chan->conn_state & L2CAP_CONN_SAR_SDU))
break; break;
memcpy(skb_put(pi->sdu, skb->len), skb->data, skb->len); memcpy(skb_put(chan->sdu, skb->len), skb->data, skb->len);
pi->partial_sdu_len += skb->len; chan->partial_sdu_len += skb->len;
if (pi->partial_sdu_len > pi->sdu_len) if (chan->partial_sdu_len > chan->sdu_len)
kfree_skb(pi->sdu); kfree_skb(chan->sdu);
else else
err = 0; err = 0;
...@@ -3159,16 +3159,16 @@ static int l2cap_streaming_reassembly_sdu(struct l2cap_chan *chan, struct sk_buf ...@@ -3159,16 +3159,16 @@ static int l2cap_streaming_reassembly_sdu(struct l2cap_chan *chan, struct sk_buf
if (!(chan->conn_state & L2CAP_CONN_SAR_SDU)) if (!(chan->conn_state & L2CAP_CONN_SAR_SDU))
break; break;
memcpy(skb_put(pi->sdu, skb->len), skb->data, skb->len); memcpy(skb_put(chan->sdu, skb->len), skb->data, skb->len);
chan->conn_state &= ~L2CAP_CONN_SAR_SDU; chan->conn_state &= ~L2CAP_CONN_SAR_SDU;
pi->partial_sdu_len += skb->len; chan->partial_sdu_len += skb->len;
if (pi->partial_sdu_len > pi->imtu) if (chan->partial_sdu_len > pi->imtu)
goto drop; goto drop;
if (pi->partial_sdu_len == pi->sdu_len) { if (chan->partial_sdu_len == chan->sdu_len) {
_skb = skb_clone(pi->sdu, GFP_ATOMIC); _skb = skb_clone(chan->sdu, GFP_ATOMIC);
err = sock_queue_rcv_skb(chan->sk, _skb); err = sock_queue_rcv_skb(chan->sk, _skb);
if (err < 0) if (err < 0)
kfree_skb(_skb); kfree_skb(_skb);
...@@ -3176,7 +3176,7 @@ static int l2cap_streaming_reassembly_sdu(struct l2cap_chan *chan, struct sk_buf ...@@ -3176,7 +3176,7 @@ static int l2cap_streaming_reassembly_sdu(struct l2cap_chan *chan, struct sk_buf
err = 0; err = 0;
drop: drop:
kfree_skb(pi->sdu); kfree_skb(chan->sdu);
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