Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 306939
b: refs/heads/master
c: 35c84d7
h: refs/heads/master
i:
  306937: 9b88734
  306935: 93229dc
v: v3
  • Loading branch information
Mat Martineau authored and Gustavo Padovan committed May 16, 2012
1 parent ce830b6 commit d1efbd6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 85d59726c5c66016a507f1f4a60db8e374dd284d
refs/heads/master: 35c84d76ee52f49fe2635d8cd686b5b658e8d892
20 changes: 0 additions & 20 deletions trunk/net/bluetooth/l2cap_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -5000,8 +5000,6 @@ int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags)

if (!(flags & ACL_CONT)) {
struct l2cap_hdr *hdr;
struct l2cap_chan *chan;
u16 cid;
int len;

if (conn->rx_len) {
Expand All @@ -5021,7 +5019,6 @@ int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags)

hdr = (struct l2cap_hdr *) skb->data;
len = __le16_to_cpu(hdr->len) + L2CAP_HDR_SIZE;
cid = __le16_to_cpu(hdr->cid);

if (len == skb->len) {
/* Complete frame received */
Expand All @@ -5038,23 +5035,6 @@ int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags)
goto drop;
}

chan = l2cap_get_chan_by_scid(conn, cid);

if (chan && chan->sk) {
struct sock *sk = chan->sk;
lock_sock(sk);

if (chan->imtu < len - L2CAP_HDR_SIZE) {
BT_ERR("Frame exceeding recv MTU (len %d, "
"MTU %d)", len,
chan->imtu);
release_sock(sk);
l2cap_conn_unreliable(conn, ECOMM);
goto drop;
}
release_sock(sk);
}

/* Allocate skb for the complete frame (with header) */
conn->rx_skb = bt_skb_alloc(len, GFP_ATOMIC);
if (!conn->rx_skb)
Expand Down

0 comments on commit d1efbd6

Please sign in to comment.