3 files changed, 10 insertions, 9 deletions

diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c
index 93753692c37a..96505e3ab986 100644
--- a/drivers/scsi/bnx2i/bnx2i_hwi.c
+++ b/drivers/scsi/bnx2i/bnx2i_hwi.c
@@ -2388,19 +2388,21 @@ static void bnx2i_cm_remote_abort(struct cnic_sock *cm_sk)
 }
 
 
-static void bnx2i_send_nl_mesg(struct cnic_dev *dev, u32 msg_type,
+static int bnx2i_send_nl_mesg(void *context, u32 msg_type,
                                char *buf, u16 buflen)
 {
-        struct bnx2i_hba *hba;
+        struct bnx2i_hba *hba = context;
+        int rc;
 
-        hba = bnx2i_find_hba_for_cnic(dev);
         if (!hba)
-                return;
+                return -ENODEV;
 
-        if (iscsi_offload_mesg(hba->shost, &bnx2i_iscsi_transport,
-                                   msg_type, buf, buflen))
+        rc = iscsi_offload_mesg(hba->shost, &bnx2i_iscsi_transport,
+                                msg_type, buf, buflen);
+        if (rc)
                 printk(KERN_ALERT "bnx2i: private nl message send error\n");
 
+        return rc;
 }
 
 
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
index be5661707dfa..d2ad3d676724 100644
--- a/drivers/scsi/cxgbi/libcxgbi.c
+++ b/drivers/scsi/cxgbi/libcxgbi.c
@@ -825,7 +825,7 @@ unsigned int cxgbi_sock_select_mss(struct cxgbi_sock *csk, unsigned int pmtu)
         unsigned int idx;
         struct dst_entry *dst = csk->dst;
 
-        csk->advmss = dst_metric(dst, RTAX_ADVMSS);
+        csk->advmss = dst_metric_advmss(dst);
 
         if (csk->advmss > pmtu - 40)
                 csk->advmss = pmtu - 40;
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 0ed7a66cdded..501f67bef719 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1636,9 +1636,8 @@ struct request_queue *__scsi_alloc_queue(struct Scsi_Host *shost,
 
         blk_queue_max_segment_size(q, dma_get_max_seg_size(dev));
 
-        /* New queue, no concurrency on queue_flags */
         if (!shost->use_clustering)
-                queue_flag_clear_unlocked(QUEUE_FLAG_CLUSTER, q);
+                q->limits.cluster = 0;
 
         /*
          * set a reasonable default alignment on word boundaries: the