[SCSI] fcoe: cleanup cpu selection for incoming requests

[pandora-kernel.git] / drivers / scsi / fcoe / fcoe.c

diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 528b86b..ba710e3 100644 (file)
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -1270,30 +1270,20 @@ static int fcoe_cpu_callback(struct notifier_block *nfb,
 /**
  * fcoe_select_cpu() - Selects CPU to handle post-processing of incoming
  *                     command.
- * @curr_cpu:   CPU which received request
  *
- * This routine selects next CPU based on cpumask.
+ * This routine selects next CPU based on cpumask to distribute
+ * incoming requests in round robin.
  *
- * Returns: int (CPU number). Caller to verify if returned CPU is online or not.
+ * Returns: int CPU number
  */
-static unsigned int fcoe_select_cpu(unsigned int curr_cpu)
+static inline unsigned int fcoe_select_cpu(void)
 {
        static unsigned int selected_cpu;
 
-       if (num_online_cpus() == 1)
-               return curr_cpu;
-       /*
-        * Doing following check, to skip "curr_cpu (smp_processor_id)"
-        * from selection of CPU is intentional. This is to avoid same CPU
-        * doing post-processing of command. "curr_cpu" to just receive
-        * incoming request in case where rx_id is UNKNOWN and all other
-        * CPU to actually process the command(s)
-        */
-       do {
-               selected_cpu = cpumask_next(selected_cpu, cpu_online_mask);
-               if (selected_cpu >= nr_cpu_ids)
-                       selected_cpu = cpumask_first(cpu_online_mask);
-       } while (selected_cpu == curr_cpu);
+       selected_cpu = cpumask_next(selected_cpu, cpu_online_mask);
+       if (selected_cpu >= nr_cpu_ids)
+               selected_cpu = cpumask_first(cpu_online_mask);
+
        return selected_cpu;
 }
 
@@ -1368,23 +1358,16 @@ int fcoe_rcv(struct sk_buff *skb, struct net_device *netdev,
         * In case the incoming frame's exchange is originated from
         * the initiator, then received frame's exchange id is ANDed
         * with fc_cpu_mask bits to get the same cpu on which exchange
-        * was originated, otherwise just use the current cpu.
+        * was originated, otherwise select cpu using rx exchange id
+        * or fcoe_select_cpu().
         */
        if (ntoh24(fh->fh_f_ctl) & FC_FC_EX_CTX)
                cpu = ntohs(fh->fh_ox_id) & fc_cpu_mask;
        else {
-               cpu = smp_processor_id();
-
-               if ((fh->fh_type == FC_TYPE_FCP) &&
-                   (ntohs(fh->fh_rx_id) == FC_XID_UNKNOWN)) {
-                       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)) {
+               if (ntohs(fh->fh_rx_id) == FC_XID_UNKNOWN)
+                       cpu = fcoe_select_cpu();
+               else
                        cpu = ntohs(fh->fh_rx_id) & fc_cpu_mask;
-               } else
-                       cpu = smp_processor_id();
        }
 
        if (cpu >= nr_cpu_ids)