diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-22 16:21:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-22 16:21:38 -0400 |
| commit | 1ed3aad141fe595673c20225a9e004730088be52 (patch) | |
| tree | dec75e69b602e677ba0e5231f2d3036663fbd66a /net/bluetooth/l2cap_core.c | |
| parent | f01cb5fbea1c1613621f9f32f385e12c1a29dde0 (diff) | |
| parent | 069f40fc07f6df3da325e7ea1698a0d6247983d5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index ca27f3a4153..2c8dd4494c6 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c | |||
| @@ -1051,6 +1051,7 @@ static void l2cap_retransmit_one_frame(struct sock *sk, u8 tx_seq) | |||
| 1051 | tx_skb = skb_clone(skb, GFP_ATOMIC); | 1051 | tx_skb = skb_clone(skb, GFP_ATOMIC); |
| 1052 | bt_cb(skb)->retries++; | 1052 | bt_cb(skb)->retries++; |
| 1053 | control = get_unaligned_le16(tx_skb->data + L2CAP_HDR_SIZE); | 1053 | control = get_unaligned_le16(tx_skb->data + L2CAP_HDR_SIZE); |
| 1054 | control &= L2CAP_CTRL_SAR; | ||
| 1054 | 1055 | ||
| 1055 | if (pi->conn_state & L2CAP_CONN_SEND_FBIT) { | 1056 | if (pi->conn_state & L2CAP_CONN_SEND_FBIT) { |
| 1056 | control |= L2CAP_CTRL_FINAL; | 1057 | control |= L2CAP_CTRL_FINAL; |