---

yaml --- r: 315279 b: refs/heads/master c: 5018e49 h: refs/heads/master i: 315277: b1ee043 315275: a9d6270 315271: 71ce2e3 315263: cc1e2e3 v: v3
git-mirror · Jul 9, 2012 · 236ffd0 · 236ffd0
1 parent 09090db
commit 236ffd0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3b404453192aa195ccfb2f0d946f880b16f8b1f
+refs/heads/master: 5018e490c372d5ed0e0ced2f2471140bf5ba9b32
diff --git a/trunk/net/nfc/hci/shdlc.c b/trunk/net/nfc/hci/shdlc.c
@@ -404,12 +404,12 @@ static void nfc_shdlc_rcv_u_frame(struct nfc_shdlc *shdlc,
 				r = nfc_shdlc_connect_send_ua(shdlc);
 				nfc_shdlc_connect_complete(shdlc, r);
 			}
-		} else if (shdlc->state > SHDLC_NEGOCIATING) {
+		} else if (shdlc->state == SHDLC_CONNECTED) {
 			/*
-			 * TODO: Chip wants to reset link
-			 * send ua, empty skb lists, reset counters
-			 * propagate info to HCI layer
+			 * Chip wants to reset link. This is unexpected and
+			 * unsupported.
 			 */
+			shdlc->hard_fault = -ECONNRESET;
 		}
 		break;
 	case U_FRAME_UA: