NFC: Handle RSET in SHDLC_CONNECTING state

As queue_work() does not guarantee immediate execution of sm_work it
can happen in crossover RSET usecase that connect timer will constantly
change the shdlc state from NEGOTIATING to CONNECTING before shdlc has
chance to handle incoming frame.

Signed-off-by: Waldemar Rymarkiewicz <[email protected]>
Acked-by: Eric Lapuyade <[email protected]>
Signed-off-by: Samuel Ortiz <[email protected]>

diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c
index d54bfc51c693fc7b4431c13378ce0ddec078b0da..a7931c7c57f27419145768b5332d0a2b0a5dce41 100644 (file)
--- a/net/nfc/hci/llc_shdlc.c
+++ b/net/nfc/hci/llc_shdlc.c
@@ -414,7 +414,8 @@ static void llc_shdlc_rcv_u_frame(struct llc_shdlc *shdlc,
 
        switch (u_frame_modifier) {
        case U_FRAME_RSET:
-               if (shdlc->state == SHDLC_NEGOCIATING) {
+               if ((shdlc->state == SHDLC_NEGOCIATING) ||
+                                       (shdlc->state == SHDLC_CONNECTING)) {
                        /* we sent RSET, but chip wants to negociate */
                        if (skb->len > 0)
                                w = skb->data[0];