From 45bb652965353d219858978111c88d597fd3a6ab Mon Sep 17 00:00:00 2001 From: "Gustavo F. Padovan" Date: Sat, 3 Oct 2009 02:34:37 -0300 Subject: [PATCH] --- yaml --- r: 172165 b: refs/heads/master c: 889a3ca466018ab68363c3168993793bc2d984f1 h: refs/heads/master i: 172163: 70293d881f04fee0d566ff8788f599e644ca1921 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/l2cap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 82f35d8489c9..59fe15b412b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0565c1c24af94130b891f989fa608faddfadc52c +refs/heads/master: 889a3ca466018ab68363c3168993793bc2d984f1 diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c index dfd0327cf8da..2d5d37545b10 100644 --- a/trunk/net/bluetooth/l2cap.c +++ b/trunk/net/bluetooth/l2cap.c @@ -3443,7 +3443,7 @@ static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, str } else if (rx_control & L2CAP_CTRL_FINAL) { if ((pi->conn_state & L2CAP_CONN_SREJ_ACT) && pi->srej_save_reqseq == tx_seq) - pi->srej_save_reqseq &= ~L2CAP_CONN_SREJ_ACT; + pi->conn_state &= ~L2CAP_CONN_SREJ_ACT; else l2cap_retransmit_frame(sk, tx_seq); }