diff options
author | Gustavo F. Padovan <padovan@profusion.mobi> | 2010-05-05 19:05:57 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2010-05-10 03:28:52 -0400 |
commit | 9b16dc6551cbde65d0ac525af3c46efab53a2c46 (patch) | |
tree | 6634c109c4d6de8f3b06cfd0c026d605c70c2402 /net/bluetooth | |
parent | a2e12a2a312f816d5970b0c809d43b399fbfe90c (diff) |
Bluetooth: Check if we really are in WAIT_F when F bit comes
F-bit set should be processed only if we are in the WAIT_F state.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: João Paulo Rechi Vita <jprvita@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/l2cap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index 5a5203f03642..eb5cb29115a7 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c | |||
@@ -3503,7 +3503,8 @@ static inline int l2cap_data_channel_iframe(struct sock *sk, u16 rx_control, str | |||
3503 | 3503 | ||
3504 | BT_DBG("sk %p rx_control 0x%4.4x len %d", sk, rx_control, skb->len); | 3504 | BT_DBG("sk %p rx_control 0x%4.4x len %d", sk, rx_control, skb->len); |
3505 | 3505 | ||
3506 | if (L2CAP_CTRL_FINAL & rx_control) { | 3506 | if (L2CAP_CTRL_FINAL & rx_control && |
3507 | l2cap_pi(sk)->conn_state & L2CAP_CONN_WAIT_F) { | ||
3507 | del_timer(&pi->monitor_timer); | 3508 | del_timer(&pi->monitor_timer); |
3508 | if (pi->unacked_frames > 0) | 3509 | if (pi->unacked_frames > 0) |
3509 | __mod_retrans_timer(); | 3510 | __mod_retrans_timer(); |
@@ -3727,7 +3728,8 @@ static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, str | |||
3727 | { | 3728 | { |
3728 | BT_DBG("sk %p rx_control 0x%4.4x len %d", sk, rx_control, skb->len); | 3729 | BT_DBG("sk %p rx_control 0x%4.4x len %d", sk, rx_control, skb->len); |
3729 | 3730 | ||
3730 | if (L2CAP_CTRL_FINAL & rx_control) { | 3731 | if (L2CAP_CTRL_FINAL & rx_control && |
3732 | l2cap_pi(sk)->conn_state & L2CAP_CONN_WAIT_F) { | ||
3731 | del_timer(&l2cap_pi(sk)->monitor_timer); | 3733 | del_timer(&l2cap_pi(sk)->monitor_timer); |
3732 | if (l2cap_pi(sk)->unacked_frames > 0) | 3734 | if (l2cap_pi(sk)->unacked_frames > 0) |
3733 | __mod_retrans_timer(); | 3735 | __mod_retrans_timer(); |