Merge remote-tracking branch 'asoc/fix/arizona' into tmp

[karo-tx-linux.git] / drivers / scsi / fnic / fnic_fcs.c

diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c
index 2b48d79bad94a4fd6f167900581370aa3f8b29d2..483eb9dbe66366377c5dd4f049c15a160ca2a500 100644 (file)
--- a/drivers/scsi/fnic/fnic_fcs.c
+++ b/drivers/scsi/fnic/fnic_fcs.c
@@ -411,7 +411,7 @@ int fnic_rq_cmpl_handler(struct fnic *fnic, int rq_work_to_do)
                        err = vnic_rq_fill(&fnic->rq[i], fnic_alloc_rq_frame);
                        if (err)
                                shost_printk(KERN_ERR, fnic->lport->host,
-                                            "fnic_alloc_rq_frame cant alloc"
+                                            "fnic_alloc_rq_frame can't alloc"
                                             " frame\n");
                }
                tot_rq_work_done += cur_work_done;
@@ -495,7 +495,8 @@ void fnic_eth_send(struct fcoe_ctlr *fip, struct sk_buff *skb)
        }
 
        fnic_queue_wq_eth_desc(wq, skb, pa, skb->len,
-                              fnic->vlan_hw_insert, fnic->vlan_id, 1);
+                              0 /* hw inserts cos value */,
+                              fnic->vlan_id, 1);
        spin_unlock_irqrestore(&fnic->wq_lock[0], flags);
 }
 
@@ -563,7 +564,8 @@ static int fnic_send_frame(struct fnic *fnic, struct fc_frame *fp)
        }
 
        fnic_queue_wq_desc(wq, skb, pa, tot_len, fr_eof(fp),
-                          fnic->vlan_hw_insert, fnic->vlan_id, 1, 1, 1);
+                          0 /* hw inserts cos value */,
+                          fnic->vlan_id, 1, 1, 1);
 fnic_send_frame_end:
        spin_unlock_irqrestore(&fnic->wq_lock[0], flags);