2019-07-21 12:54:37

by Christophe JAILLET

Subject: [PATCH] scsi: fcoe: fix a typo

#define relative to FCOE CTLR start with FCOE_CTLR, except
FCOE_CTRL_SOL_TOV.

This is likely a typo and CTRL should be CTLR here as well.

Signed-off-by: Christophe JAILLET <[email protected]>
---
drivers/scsi/fcoe/fcoe_ctlr.c | 2 +-
include/scsi/libfcoe.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
index 0d7770d07405..5aaa3298de6f 100644
--- a/drivers/scsi/fcoe/fcoe_ctlr.c
+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
@@ -1019,7 +1019,7 @@ static void fcoe_ctlr_recv_adv(struct fcoe_ctlr *fip, struct sk_buff *skb)
{
struct fcoe_fcf *fcf;
struct fcoe_fcf new;
- unsigned long sol_tov = msecs_to_jiffies(FCOE_CTRL_SOL_TOV);
+ unsigned long sol_tov = msecs_to_jiffies(FCOE_CTLR_SOL_TOV);
int first = 0;
int mtu_valid;
int found = 0;
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index c50fb297e265..dc14b52577f7 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -31,7 +31,7 @@
* FIP tunable parameters.
*/
#define FCOE_CTLR_START_DELAY 2000 /* mS after first adv. to choose FCF */
-#define FCOE_CTRL_SOL_TOV 2000 /* min. solicitation interval (mS) */
+#define FCOE_CTLR_SOL_TOV 2000 /* min. solicitation interval (mS) */
#define FCOE_CTLR_FCF_LIMIT 20 /* max. number of FCF entries */
#define FCOE_CTLR_VN2VN_LOGIN_LIMIT 3 /* max. VN2VN rport login retries */

--
2.20.1

2019-07-22 05:47:52

by Hannes Reinecke

Subject: Re: [PATCH] scsi: fcoe: fix a typo

On 7/21/19 2:50 PM, Christophe JAILLET wrote:
> #define relative to FCOE CTLR start with FCOE_CTLR, except
> FCOE_CTRL_SOL_TOV.
>
> This is likely a typo and CTRL should be CTLR here as well.
>
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> drivers/scsi/fcoe/fcoe_ctlr.c | 2 +-
> include/scsi/libfcoe.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
> index 0d7770d07405..5aaa3298de6f 100644
> --- a/drivers/scsi/fcoe/fcoe_ctlr.c
> +++ b/drivers/scsi/fcoe/fcoe_ctlr.c
> @@ -1019,7 +1019,7 @@ static void fcoe_ctlr_recv_adv(struct fcoe_ctlr *fip, struct sk_buff *skb)
> {
> struct fcoe_fcf *fcf;
> struct fcoe_fcf new;
> - unsigned long sol_tov = msecs_to_jiffies(FCOE_CTRL_SOL_TOV);
> + unsigned long sol_tov = msecs_to_jiffies(FCOE_CTLR_SOL_TOV);
> int first = 0;
> int mtu_valid;
> int found = 0;
> diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
> index c50fb297e265..dc14b52577f7 100644
> --- a/include/scsi/libfcoe.h
> +++ b/include/scsi/libfcoe.h
> @@ -31,7 +31,7 @@
> * FIP tunable parameters.
> */
> #define FCOE_CTLR_START_DELAY 2000 /* mS after first adv. to choose FCF */
> -#define FCOE_CTRL_SOL_TOV 2000 /* min. solicitation interval (mS) */
> +#define FCOE_CTLR_SOL_TOV 2000 /* min. solicitation interval (mS) */
> #define FCOE_CTLR_FCF_LIMIT 20 /* max. number of FCF entries */
> #define FCOE_CTLR_VN2VN_LOGIN_LIMIT 3 /* max. VN2VN rport login retries */
>
>
Reviewed-by: Hannes Reinecke <[email protected]>

Cheers,

Hannes
--
Dr. Hannes Reinecke Teamlead Storage & Networking
[email protected] +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG Nürnberg)

2019-07-24 02:38:10

by Martin K. Petersen

Subject: Re: [PATCH] scsi: fcoe: fix a typo

Christophe,

> #define relative to FCOE CTLR start with FCOE_CTLR, except
> FCOE_CTRL_SOL_TOV.
>
> This is likely a typo and CTRL should be CTLR here as well.

Applied to 5.3/scsi-fixes, thanks!

--
Martin K. Petersen Oracle Linux Engineering