diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/scsi/fnic/fnic_res.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/scsi/fnic/fnic_res.c')
| -rw-r--r-- | drivers/scsi/fnic/fnic_res.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/fnic/fnic_res.c b/drivers/scsi/fnic/fnic_res.c index 7ba61ec715d2..50488f8e169d 100644 --- a/drivers/scsi/fnic/fnic_res.c +++ b/drivers/scsi/fnic/fnic_res.c | |||
| @@ -144,10 +144,9 @@ int fnic_get_vnic_config(struct fnic *fnic) | |||
| 144 | c->intr_timer_type = c->intr_timer_type; | 144 | c->intr_timer_type = c->intr_timer_type; |
| 145 | 145 | ||
| 146 | shost_printk(KERN_INFO, fnic->lport->host, | 146 | shost_printk(KERN_INFO, fnic->lport->host, |
| 147 | "vNIC MAC addr %02x:%02x:%02x:%02x:%02x:%02x " | 147 | "vNIC MAC addr %pM " |
| 148 | "wq/wq_copy/rq %d/%d/%d\n", | 148 | "wq/wq_copy/rq %d/%d/%d\n", |
| 149 | fnic->mac_addr[0], fnic->mac_addr[1], fnic->mac_addr[2], | 149 | fnic->ctlr.ctl_src_addr, |
| 150 | fnic->mac_addr[3], fnic->mac_addr[4], fnic->mac_addr[5], | ||
| 151 | c->wq_enet_desc_count, c->wq_copy_desc_count, | 150 | c->wq_enet_desc_count, c->wq_copy_desc_count, |
| 152 | c->rq_desc_count); | 151 | c->rq_desc_count); |
| 153 | shost_printk(KERN_INFO, fnic->lport->host, | 152 | shost_printk(KERN_INFO, fnic->lport->host, |