Commit a303ce09 authored by Ron Mercer's avatar Ron Mercer Committed by David S. Miller
Browse files

qlge: Fix sparse endian warning for inbound packet control block flags. 



Changed flags element from __le32 to 3 reserved bytes and one byte of
flags.  Changed flags bit definitions to reflect byte width instead of
__le32 width.

Warnings:
drivers/net/qlge/qlge_main.c:1206:16: warning: restricted degrades to integer
drivers/net/qlge/qlge_main.c:1207:16: warning: restricted degrades to integer
drivers/net/qlge/qlge_main.c:1233:17: warning: restricted degrades to integer
drivers/net/qlge/qlge_main.c:1276:17: warning: restricted degrades to integer
drivers/net/qlge/qlge_main.c:1349:19: warning: restricted degrades to integer

Signed-off-by: default avatarRon Mercer <ron.mercer@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8306c952

drivers/net/qlge/qlge.h

+5 −4
Original line number Diff line number Diff line
@@ -979,10 +979,11 @@ struct ib_mac_iocb_rsp { 


	__le16 reserved1;

	__le32 reserved2[6];

	__le32 flags4;

#define IB_MAC_IOCB_RSP_HV	0x20000000	/* */

#define IB_MAC_IOCB_RSP_HS	0x40000000	/* */

#define IB_MAC_IOCB_RSP_HL	0x80000000	/* */

	u8 reserved3[3];

	u8 flags4;

#define IB_MAC_IOCB_RSP_HV	0x20

#define IB_MAC_IOCB_RSP_HS	0x40

#define IB_MAC_IOCB_RSP_HL	0x80

	__le32 hdr_len;		/* */

	__le32 hdr_addr_lo;	/* */

	__le32 hdr_addr_hi;	/* */

drivers/net/qlge/qlge_dbg.c

+5 −8
Original line number Diff line number Diff line
@@ -821,14 +821,11 @@ void ql_dump_ib_mac_rsp(struct ib_mac_iocb_rsp *ib_mac_rsp) 
		       le16_to_cpu(ib_mac_rsp->vlan_id));



	printk(KERN_ERR PFX "flags4 = %s%s%s.\n",

	       le32_to_cpu(ib_mac_rsp->

			   flags4) & IB_MAC_IOCB_RSP_HV ? "HV " : "",

	       le32_to_cpu(ib_mac_rsp->

			   flags4) & IB_MAC_IOCB_RSP_HS ? "HS " : "",

	       le32_to_cpu(ib_mac_rsp->

			   flags4) & IB_MAC_IOCB_RSP_HL ? "HL " : "");



	if (le32_to_cpu(ib_mac_rsp->flags4) & IB_MAC_IOCB_RSP_HV) {

		ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HV ? "HV " : "",

		ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HS ? "HS " : "",

		ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HL ? "HL " : "");



	if (ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HV) {

		printk(KERN_ERR PFX "hdr length	= %d.\n",

		       le32_to_cpu(ib_mac_rsp->hdr_len));

		printk(KERN_ERR PFX "hdr addr_hi    = 0x%x.\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE