diff mbox series

scsi: fcoe: fix mismatched fcoe_wwn_from_mac declaration

Message ID 20210322164702.957810-1-arnd@kernel.org (mailing list archive)
State Accepted
Headers show
Series scsi: fcoe: fix mismatched fcoe_wwn_from_mac declaration | expand

Commit Message

Arnd Bergmann March 22, 2021, 4:46 p.m. UTC 
From: Arnd Bergmann <arnd@arndb.de>

An old cleanup changed the array size from MAX_ADDR_LEN to
unspecified in the declaration, but now gcc-11 warns about this:

drivers/scsi/fcoe/fcoe_ctlr.c:1972:37: error: argument 1 of type ‘unsigned char[32]’ with mismatched bound [-Werror=array-parameter=]
 1972 | u64 fcoe_wwn_from_mac(unsigned char mac[MAX_ADDR_LEN],
      |                       ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~
In file included from /git/arm-soc/drivers/scsi/fcoe/fcoe_ctlr.c:33:
include/scsi/libfcoe.h:252:37: note: previously declared as ‘unsigned char[]’
  252 | u64 fcoe_wwn_from_mac(unsigned char mac[], unsigned int, unsigned int);
      |                       ~~~~~~~~~~~~~~^~~~~

Change the type back to what the function definition uses.

Fixes: fdd78027fd47 ("[SCSI] fcoe: cleans up libfcoe.h and adds fcoe.h for fcoe module")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 include/scsi/libfcoe.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Martin K. Petersen April 6, 2021, 4:53 a.m. UTC | #1 
On Mon, 22 Mar 2021 17:46:59 +0100, Arnd Bergmann wrote:

> An old cleanup changed the array size from MAX_ADDR_LEN to
> unspecified in the declaration, but now gcc-11 warns about this:
> 
> drivers/scsi/fcoe/fcoe_ctlr.c:1972:37: error: argument 1 of type ‘unsigned char[32]’ with mismatched bound [-Werror=array-parameter=]
>  1972 | u64 fcoe_wwn_from_mac(unsigned char mac[MAX_ADDR_LEN],
>       |                       ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~
> In file included from /git/arm-soc/drivers/scsi/fcoe/fcoe_ctlr.c:33:
> include/scsi/libfcoe.h:252:37: note: previously declared as ‘unsigned char[]’
>   252 | u64 fcoe_wwn_from_mac(unsigned char mac[], unsigned int, unsigned int);
>       |                       ~~~~~~~~~~~~~~^~~~~
> 
> [...]

Applied to 5.13/scsi-queue, thanks!

[1/1] scsi: fcoe: fix mismatched fcoe_wwn_from_mac declaration
      https://git.kernel.org/mkp/scsi/c/5b11c9d80bde
diff mbox series

Patch

diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index 2568cb0627ec..fac8e89aed81 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -249,7 +249,7 @@  int fcoe_ctlr_recv_flogi(struct fcoe_ctlr *, struct fc_lport *,
 			 struct fc_frame *);
 
 /* libfcoe funcs */
-u64 fcoe_wwn_from_mac(unsigned char mac[], unsigned int, unsigned int);
+u64 fcoe_wwn_from_mac(unsigned char mac[MAX_ADDR_LEN], unsigned int, unsigned int);
 int fcoe_libfc_config(struct fc_lport *, struct fcoe_ctlr *,
 		      const struct libfc_function_template *, int init_fcp);
 u32 fcoe_fc_crc(struct fc_frame *fp);