From 0e886cffd44eef1547f4887c090b3f0529bf7489 Mon Sep 17 00:00:00 2001
From: Kiran Patil <kiran.patil@intel.com>
Date: Mon, 20 Jun 2011 16:59:25 -0700
Subject: [PATCH] --- yaml --- r: 257829 b: refs/heads/master c:
 29bdd2bb3e48c742e6b5a0be2ff2fa00e9838fe0 h: refs/heads/master i:   257827:
 9fa48eda9611b0fe56f96ae8b25aad480a0732ec v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/scsi/fcoe/fcoe.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ae9f82a7f9cf..540e8aaa16f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 064287eee372e8a2effe77fb909a40da9e7a1fd7
+refs/heads/master: 29bdd2bb3e48c742e6b5a0be2ff2fa00e9838fe0
diff --git a/trunk/drivers/scsi/fcoe/fcoe.c b/trunk/drivers/scsi/fcoe/fcoe.c
index da73115ddf4d..522fbaaf9782 100644
--- a/trunk/drivers/scsi/fcoe/fcoe.c
+++ b/trunk/drivers/scsi/fcoe/fcoe.c
@@ -1358,7 +1358,11 @@ int fcoe_rcv(struct sk_buff *skb, struct net_device *netdev,
 			do {
 				cpu = fcoe_select_cpu(cpu);
 			} while (!cpu_online(cpu));
-		}
+		} else  if ((fh->fh_type == FC_TYPE_FCP) &&
+			    (ntohs(fh->fh_rx_id) != FC_XID_UNKNOWN)) {
+			cpu = ntohs(fh->fh_rx_id) & fc_cpu_mask;
+		} else
+			cpu = smp_processor_id();
 	}
 	fps = &per_cpu(fcoe_percpu, cpu);
 	spin_lock_bh(&fps->fcoe_rx_list.lock);