diff --git a/[refs] b/[refs]
index eb0b0d387c49..8a708b398b65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d65b0df6c5951271cd368170bca8601aa2e65c7
+refs/heads/master: f4568b8b9766d083c0e61346173bb22274128208
diff --git a/trunk/drivers/scsi/libfc/fc_npiv.c b/trunk/drivers/scsi/libfc/fc_npiv.c
index c68f6c7341c2..45b6f1e2df92 100644
--- a/trunk/drivers/scsi/libfc/fc_npiv.c
+++ b/trunk/drivers/scsi/libfc/fc_npiv.c
@@ -72,6 +72,9 @@ struct fc_lport *fc_vport_id_lookup(struct fc_lport *n_port, u32 port_id)
 	if (fc_host_port_id(n_port->host) == port_id)
 		return n_port;
 
+	if (port_id == FC_FID_FLOGI)
+		return n_port;		/* for point-to-point */
+
 	mutex_lock(&n_port->lp_mutex);
 	list_for_each_entry(vn_port, &n_port->vports, list) {
 		if (fc_host_port_id(vn_port->host) == port_id) {