---

yaml --- r: 316823 b: refs/heads/master c: ac166d2 h: refs/heads/master i: 316821: 7a2b1a2 316819: d50343d 316815: 83b48a3 v: v3
git-mirror · Jul 20, 2012 · 8ea6f16 · 8ea6f16
1 parent 2caeb87
commit 8ea6f16
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db95fc004ea50f661a98c9f25585c0a734b5c238
+refs/heads/master: ac166d2fbd2d0c295454bcee7b3c930cb96e72cc
diff --git a/trunk/drivers/scsi/libfc/fc_lport.c b/trunk/drivers/scsi/libfc/fc_lport.c
@@ -1598,8 +1598,9 @@ static void fc_lport_timeout(struct work_struct *work)
 	case LPORT_ST_RPA:
 	case LPORT_ST_DHBA:
 	case LPORT_ST_DPRT:
-		fc_lport_enter_ms(lport, lport->state);
-		break;
+		FC_LPORT_DBG(lport, "Skipping lport state %s to SCR\n",
+			     fc_lport_state(lport));
+		/* fall thru */
 	case LPORT_ST_SCR:
 		fc_lport_enter_scr(lport);
 		break;