From 236ffd0d33ff15203407924ec996995282dd08e8 Mon Sep 17 00:00:00 2001
From: Eric Lapuyade <eric.lapuyade@intel.com>
Date: Wed, 2 May 2012 11:23:11 +0200
Subject: [PATCH] --- yaml --- r: 315279 b: refs/heads/master c:
 5018e490c372d5ed0e0ced2f2471140bf5ba9b32 h: refs/heads/master i:   315277:
 b1ee043adb4cd36752c1f6ecafc66ffc32471255   315275:
 a9d627043b29284d524e3f2f8f4ffc7439b26dc2   315271:
 71ce2e3d16f4de08f15e5f4f6954fcebe92e691a   315263:
 cc1e2e34ca247c8c6134bf312244e177fa4477bb v: v3

---
 [refs]                    | 2 +-
 trunk/net/nfc/hci/shdlc.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ae7d273a43c3..7816a4c0c4d3 100644
--- 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
index 18d1536df5f6..6f840c18c892 100644
--- 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: