diff options
author | Ron Mercer <ron.mercer@qlogic.com> | 2009-01-05 21:18:22 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-05 21:18:22 -0500 |
commit | a303ce0972d04036316e85568682a2b89fe123d9 (patch) | |
tree | d532177ae6549de9d6360da8eb366d3de3add588 /drivers/net | |
parent | 8306c952a523ad2f87c101427c3ece91176b822c (diff) |
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: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/qlge/qlge.h | 9 | ||||
-rw-r--r-- | drivers/net/qlge/qlge_dbg.c | 13 |
2 files changed, 10 insertions, 12 deletions
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h index 97321bb9600e..71cc48799b59 100644 --- a/drivers/net/qlge/qlge.h +++ b/drivers/net/qlge/qlge.h | |||
@@ -979,10 +979,11 @@ struct ib_mac_iocb_rsp { | |||
979 | 979 | ||
980 | __le16 reserved1; | 980 | __le16 reserved1; |
981 | __le32 reserved2[6]; | 981 | __le32 reserved2[6]; |
982 | __le32 flags4; | 982 | u8 reserved3[3]; |
983 | #define IB_MAC_IOCB_RSP_HV 0x20000000 /* */ | 983 | u8 flags4; |
984 | #define IB_MAC_IOCB_RSP_HS 0x40000000 /* */ | 984 | #define IB_MAC_IOCB_RSP_HV 0x20 |
985 | #define IB_MAC_IOCB_RSP_HL 0x80000000 /* */ | 985 | #define IB_MAC_IOCB_RSP_HS 0x40 |
986 | #define IB_MAC_IOCB_RSP_HL 0x80 | ||
986 | __le32 hdr_len; /* */ | 987 | __le32 hdr_len; /* */ |
987 | __le32 hdr_addr_lo; /* */ | 988 | __le32 hdr_addr_lo; /* */ |
988 | __le32 hdr_addr_hi; /* */ | 989 | __le32 hdr_addr_hi; /* */ |
diff --git a/drivers/net/qlge/qlge_dbg.c b/drivers/net/qlge/qlge_dbg.c index 47df304a02c8..3f5e02d2e4a9 100644 --- a/drivers/net/qlge/qlge_dbg.c +++ b/drivers/net/qlge/qlge_dbg.c | |||
@@ -821,14 +821,11 @@ void ql_dump_ib_mac_rsp(struct ib_mac_iocb_rsp *ib_mac_rsp) | |||
821 | le16_to_cpu(ib_mac_rsp->vlan_id)); | 821 | le16_to_cpu(ib_mac_rsp->vlan_id)); |
822 | 822 | ||
823 | printk(KERN_ERR PFX "flags4 = %s%s%s.\n", | 823 | printk(KERN_ERR PFX "flags4 = %s%s%s.\n", |
824 | le32_to_cpu(ib_mac_rsp-> | 824 | ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HV ? "HV " : "", |
825 | flags4) & IB_MAC_IOCB_RSP_HV ? "HV " : "", | 825 | ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HS ? "HS " : "", |
826 | le32_to_cpu(ib_mac_rsp-> | 826 | ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HL ? "HL " : ""); |
827 | flags4) & IB_MAC_IOCB_RSP_HS ? "HS " : "", | 827 | |
828 | le32_to_cpu(ib_mac_rsp-> | 828 | if (ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HV) { |
829 | flags4) & IB_MAC_IOCB_RSP_HL ? "HL " : ""); | ||
830 | |||
831 | if (le32_to_cpu(ib_mac_rsp->flags4) & IB_MAC_IOCB_RSP_HV) { | ||
832 | printk(KERN_ERR PFX "hdr length = %d.\n", | 829 | printk(KERN_ERR PFX "hdr length = %d.\n", |
833 | le32_to_cpu(ib_mac_rsp->hdr_len)); | 830 | le32_to_cpu(ib_mac_rsp->hdr_len)); |
834 | printk(KERN_ERR PFX "hdr addr_hi = 0x%x.\n", | 831 | printk(KERN_ERR PFX "hdr addr_hi = 0x%x.\n", |