---

yaml --- r: 328290 b: refs/heads/master c: 9010e39 h: refs/heads/master v: v3
git-mirror · Sep 24, 2012 · e2b2a61 · e2b2a61
1 parent 977102d
commit e2b2a61
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96e324024b421b3753eb142d5d92fbe4ac5e7519
+refs/heads/master: 9010e39f508ee57dc9a7675073659cb9d019a802
diff --git a/trunk/net/nfc/hci/llc_shdlc.c b/trunk/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];