| Message ID | 20170505194745.3627137-38-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
| Series | build warnings and errors | expand |
On Fri, 2017-05-05 at 21:46 +0200, Arnd Bergmann wrote: > From: Hiral Shah <hishah@cisco.com> > > Commit fffd96e05f5a23eaff542951e7d3ae4ec2f6258f upstream. > > 1) Assgning FIP_ALL_FCF_MACS to fcoe_all_fcfs allows VLAN request to be sent > to correct Mac address for VLAN Discovery otherwise VLAN request will be > sent to invalid address hence FLOGI never happens. > > 2) Simplify the copy_and_format_trace_data code and log the correct Link event > for fnic control path tracing in case of link status UP->UP. > > 3) Increment Fnic driver version This commit is doing several different things to a driver that hasn't had any bug fixes in 3.16-stable. I'm not comfortable with cherry- picking one just to fix a warning. Ben. > Signed-off-by: Hiral Shah <hishah@cisco.com> > Signed-off-by: Sesidhar Baddela <sebaddel@cisco.com> > Signed-off-by: Christoph Hellwig <hch@lst.de> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/scsi/fnic/fnic.h | 2 +- > drivers/scsi/fnic/fnic_fcs.c | 5 +++-- > drivers/scsi/fnic/fnic_trace.c | 5 ++--- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h > index 1d3521e13d77..bf8d34c26f13 100644 > --- a/drivers/scsi/fnic/fnic.h > +++ b/drivers/scsi/fnic/fnic.h > @@ -39,7 +39,7 @@ > > #define DRV_NAME "fnic" > #define DRV_DESCRIPTION "Cisco FCoE HBA Driver" > -#define DRV_VERSION "1.6.0.10" > +#define DRV_VERSION "1.6.0.11" > #define PFX DRV_NAME ": " > #define DFX DRV_NAME "%d: " > > diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c > index 1b948f633fc5..f3984b48f8e9 100644 > --- a/drivers/scsi/fnic/fnic_fcs.c > +++ b/drivers/scsi/fnic/fnic_fcs.c > @@ -35,7 +35,7 @@ > #include "cq_enet_desc.h" > #include "cq_exch_desc.h" > > -static u8 fcoe_all_fcfs[ETH_ALEN]; > +static u8 fcoe_all_fcfs[ETH_ALEN] = FIP_ALL_FCF_MACS; > struct workqueue_struct *fnic_fip_queue; > struct workqueue_struct *fnic_event_queue; > > @@ -101,13 +101,14 @@ void fnic_handle_link(struct work_struct *work) > FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, > "link up\n"); > fcoe_ctlr_link_up(&fnic->ctlr); > - } else > + } else { > /* UP -> UP */ > spin_unlock_irqrestore(&fnic->fnic_lock, flags); > fnic_fc_trace_set_data( > fnic->lport->host->host_no, FNIC_FC_LE, > "Link Status: UP_UP", > strlen("Link Status: UP_UP")); > + } > } > } else if (fnic->link_status) { > /* DOWN -> UP */ > diff --git a/drivers/scsi/fnic/fnic_trace.c b/drivers/scsi/fnic/fnic_trace.c > index c77285926827..121a5d7e98c4 100644 > --- a/drivers/scsi/fnic/fnic_trace.c > +++ b/drivers/scsi/fnic/fnic_trace.c > @@ -743,7 +743,7 @@ void copy_and_format_trace_data(struct fc_trace_hdr *tdata, > > fmt = "%02d:%02d:%04ld %02d:%02d:%02d.%09lu ns%8x %c%8x\t"; > len += snprintf(fnic_dbgfs_prt->buffer + len, > - (fnic_fc_trace_max_pages * PAGE_SIZE * 3) - len, > + max_size - len, > fmt, > tm.tm_mon + 1, tm.tm_mday, tm.tm_year + 1900, > tm.tm_hour, tm.tm_min, tm.tm_sec, > @@ -767,8 +767,7 @@ void copy_and_format_trace_data(struct fc_trace_hdr *tdata, > j == ethhdr_len + fcoehdr_len + fchdr_len || > (i > 3 && j%fchdr_len == 0)) { > len += snprintf(fnic_dbgfs_prt->buffer > - + len, (fnic_fc_trace_max_pages > - * PAGE_SIZE * 3) - len, > + + len, max_size - len, > "\n\t\t\t\t\t\t\t\t"); > i++; > } -- Ben Hutchings It is a miracle that curiosity survives formal education. - Albert Einstein
diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index 1d3521e13d77..bf8d34c26f13 100644 --- a/drivers/scsi/fnic/fnic.h +++ b/drivers/scsi/fnic/fnic.h @@ -39,7 +39,7 @@ #define DRV_NAME "fnic" #define DRV_DESCRIPTION "Cisco FCoE HBA Driver" -#define DRV_VERSION "1.6.0.10" +#define DRV_VERSION "1.6.0.11" #define PFX DRV_NAME ": " #define DFX DRV_NAME "%d: " diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c index 1b948f633fc5..f3984b48f8e9 100644 --- a/drivers/scsi/fnic/fnic_fcs.c +++ b/drivers/scsi/fnic/fnic_fcs.c @@ -35,7 +35,7 @@ #include "cq_enet_desc.h" #include "cq_exch_desc.h" -static u8 fcoe_all_fcfs[ETH_ALEN]; +static u8 fcoe_all_fcfs[ETH_ALEN] = FIP_ALL_FCF_MACS; struct workqueue_struct *fnic_fip_queue; struct workqueue_struct *fnic_event_queue; @@ -101,13 +101,14 @@ void fnic_handle_link(struct work_struct *work) FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, "link up\n"); fcoe_ctlr_link_up(&fnic->ctlr); - } else + } else { /* UP -> UP */ spin_unlock_irqrestore(&fnic->fnic_lock, flags); fnic_fc_trace_set_data( fnic->lport->host->host_no, FNIC_FC_LE, "Link Status: UP_UP", strlen("Link Status: UP_UP")); + } } } else if (fnic->link_status) { /* DOWN -> UP */ diff --git a/drivers/scsi/fnic/fnic_trace.c b/drivers/scsi/fnic/fnic_trace.c index c77285926827..121a5d7e98c4 100644 --- a/drivers/scsi/fnic/fnic_trace.c +++ b/drivers/scsi/fnic/fnic_trace.c @@ -743,7 +743,7 @@ void copy_and_format_trace_data(struct fc_trace_hdr *tdata, fmt = "%02d:%02d:%04ld %02d:%02d:%02d.%09lu ns%8x %c%8x\t"; len += snprintf(fnic_dbgfs_prt->buffer + len, - (fnic_fc_trace_max_pages * PAGE_SIZE * 3) - len, + max_size - len, fmt, tm.tm_mon + 1, tm.tm_mday, tm.tm_year + 1900, tm.tm_hour, tm.tm_min, tm.tm_sec, @@ -767,8 +767,7 @@ void copy_and_format_trace_data(struct fc_trace_hdr *tdata, j == ethhdr_len + fcoehdr_len + fchdr_len || (i > 3 && j%fchdr_len == 0)) { len += snprintf(fnic_dbgfs_prt->buffer - + len, (fnic_fc_trace_max_pages - * PAGE_SIZE * 3) - len, + + len, max_size - len, "\n\t\t\t\t\t\t\t\t"); i++; }