From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:49889 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753499AbdKFRlo (ORCPT ); Mon, 6 Nov 2017 12:41:44 -0500 Message-ID: <1509990091.2748.104.camel@decadent.org.uk> Subject: Re: [PATCH 3.16-stable 37/87] fnic: assign FIP_ALL_FCF_MACS to fcoe_all_fcfs From: Ben Hutchings To: Arnd Bergmann Cc: stable@vger.kernel.org, Hiral Shah , Sesidhar Baddela , Christoph Hellwig Date: Mon, 06 Nov 2017 17:41:31 +0000 In-Reply-To: <20170505194745.3627137-38-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> <20170505194745.3627137-38-arnd@arndb.de> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-UGi9kDQSyjNMb2prZn9i" Mime-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: --=-UGi9kDQSyjNMb2prZn9i Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, 2017-05-05 at 21:46 +0200, Arnd Bergmann wrote: > From: Hiral Shah >=20 > Commit fffd96e05f5a23eaff542951e7d3ae4ec2f6258f upstream. >=20 > 1) Assgning FIP_ALL_FCF_MACS to fcoe_all_fcfs allows VLAN request to be s= ent > to correct Mac address for VLAN Discovery otherwise VLAN request will be > sent to invalid address hence FLOGI never happens. >=20 > 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. >=20 > 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 > Signed-off-by: Sesidhar Baddela > Signed-off-by: Christoph Hellwig > Signed-off-by: Arnd Bergmann > --- > 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(-) >=20 > 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 @@ > =20 > #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: " > =20 > 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" > =20 > -static u8 fcoe_all_fcfs[ETH_ALEN]; > +static u8 fcoe_all_fcfs[ETH_ALEN] =3D FIP_ALL_FCF_MACS; > struct workqueue_struct *fnic_fip_queue; > struct workqueue_struct *fnic_event_queue; > =20 > @@ -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_trac= e.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, > =20 > fmt =3D "%02d:%02d:%04ld %02d:%02d:%02d.%09lu ns%8x %c%8x\t"; > len +=3D 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 =3D=3D ethhdr_len + fcoehdr_len + fchdr_len || > (i > 3 && j%fchdr_len =3D=3D 0)) { > len +=3D 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++; > } --=20 Ben Hutchings It is a miracle that curiosity survives formal education. - Albert Einstein --=-UGi9kDQSyjNMb2prZn9i Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEErCspvTSmr92z9o8157/I7JWGEQkFAloAnssACgkQ57/I7JWG EQnJsQ//fKuco1e4G+z/OnkN3MdHG/EKZBeiZB3TYdrkgwZhKpA+SVK1mG0/d4eN pDrPCcV2VIH5XLr/imLt/Xjf+wjyg6zl6g54ulp1y+K6ksFyL8X/TqO0JHBurKiD HNwmiVUKDxkwwe/fFuaUlwE90DDMVPvhv8l1rPrUszBrSuVNr7XjLPYAd6+sB8hX lT2e9+tT/25snbhZ6Erp2Eh2v3w2b2z9qitcsfar9tDo3I3s22wWSFDKGA40GN9F z1BGw0Py5DCdRXVQzh5VfqeM0/VNlvYxg46yitGKOkzhRJsZoAwbgZsTSN51jGhW iwiVOqhpwGAFez83j9dfniGqQpmsVlwWNvdtY49HfWtUdX7dG51DtdnlhPHvbmU+ eusPsSX1jt68tKhLa8q2rb6+mAm+6nGrAkHY1LdK6CjJfqWLKeTUlNlxkqaVUIXZ D8X+idtag0Oe9Ekm42+XfW9/j3noMn/J17JvzwZETyu571mtXHJ5XMSmhZFPKtrp rpl3tuYd3Cj7bFUwDOGF98tlkQsnbDFkNy4Cndnn5T29o16N3CeSPlgZ5myO8B6+ pqezb0gGd9qCmnw4YWDdEpTZeq3ZS3iClsQEh7fNwatA8eFglZF2W7dHfJxScg4R rN01FWCpnBj2gPsO79Ys88TZ0e7ZLC84XV1RhIQQHPbSlmTfdBg= =SjsG -----END PGP SIGNATURE----- --=-UGi9kDQSyjNMb2prZn9i--