diff options
author | Ron Mercer <ron.mercer@qlogic.com> | 2009-01-05 21:19:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-05 21:19:59 -0500 |
commit | 3537d54c0c39de5738bba8d19f128478b0b96a71 (patch) | |
tree | 5ecdf9eb604ffa869bf9034928adfbcc8d4ffb3b | |
parent | 2c9a0d41e944807bf763f42e4a3526210e98c741 (diff) |
qlge: Fix sparse warnings for tx ring indexes.
Warnings:
drivers/net/qlge/qlge_main.c:1474:34: warning: restricted degrades to integer
drivers/net/qlge/qlge_main.c:1475:36: warning: restricted degrades to integer
drivers/net/qlge/qlge_main.c:1592:51: warning: restricted degrades to integer
drivers/net/qlge/qlge_main.c:1941:20: warning: incorrect type in assignment (different base types)
drivers/net/qlge/qlge_main.c:1941:20: expected restricted unsigned int [usertype] tid
drivers/net/qlge/qlge_main.c:1941:20: got int [signed] index
drivers/net/qlge/qlge_main.c:1945:24: warning: incorrect type in assignment (different base types)
drivers/net/qlge/qlge_main.c:1945:24: expected restricted unsigned int [usertype] txq_idx
drivers/net/qlge/qlge_main.c:1945:24: got unsigned int [unsigned] [usertype] tx_ring_idx
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/qlge/qlge.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h index 76ef2bc297cc..459663a4023d 100644 --- a/drivers/net/qlge/qlge.h +++ b/drivers/net/qlge/qlge.h | |||
@@ -851,8 +851,8 @@ struct ob_mac_iocb_req { | |||
851 | __le16 frame_len; | 851 | __le16 frame_len; |
852 | #define OB_MAC_IOCB_LEN_MASK 0x3ffff | 852 | #define OB_MAC_IOCB_LEN_MASK 0x3ffff |
853 | __le16 reserved2; | 853 | __le16 reserved2; |
854 | __le32 tid; | 854 | u32 tid; |
855 | __le32 txq_idx; | 855 | u32 txq_idx; |
856 | __le32 reserved3; | 856 | __le32 reserved3; |
857 | __le16 vlan_tci; | 857 | __le16 vlan_tci; |
858 | __le16 reserved4; | 858 | __le16 reserved4; |
@@ -871,8 +871,8 @@ struct ob_mac_iocb_rsp { | |||
871 | u8 flags2; /* */ | 871 | u8 flags2; /* */ |
872 | u8 flags3; /* */ | 872 | u8 flags3; /* */ |
873 | #define OB_MAC_IOCB_RSP_B 0x80 /* */ | 873 | #define OB_MAC_IOCB_RSP_B 0x80 /* */ |
874 | __le32 tid; | 874 | u32 tid; |
875 | __le32 txq_idx; | 875 | u32 txq_idx; |
876 | __le32 reserved[13]; | 876 | __le32 reserved[13]; |
877 | } __attribute((packed)); | 877 | } __attribute((packed)); |
878 | 878 | ||
@@ -894,8 +894,8 @@ struct ob_mac_tso_iocb_req { | |||
894 | #define OB_MAC_TSO_IOCB_V 0x04 | 894 | #define OB_MAC_TSO_IOCB_V 0x04 |
895 | __le32 reserved1[2]; | 895 | __le32 reserved1[2]; |
896 | __le32 frame_len; | 896 | __le32 frame_len; |
897 | __le32 tid; | 897 | u32 tid; |
898 | __le32 txq_idx; | 898 | u32 txq_idx; |
899 | __le16 total_hdrs_len; | 899 | __le16 total_hdrs_len; |
900 | __le16 net_trans_offset; | 900 | __le16 net_trans_offset; |
901 | #define OB_MAC_TRANSPORT_HDR_SHIFT 6 | 901 | #define OB_MAC_TRANSPORT_HDR_SHIFT 6 |
@@ -916,8 +916,8 @@ struct ob_mac_tso_iocb_rsp { | |||
916 | u8 flags2; /* */ | 916 | u8 flags2; /* */ |
917 | u8 flags3; /* */ | 917 | u8 flags3; /* */ |
918 | #define OB_MAC_TSO_IOCB_RSP_B 0x8000 | 918 | #define OB_MAC_TSO_IOCB_RSP_B 0x8000 |
919 | __le32 tid; | 919 | u32 tid; |
920 | __le32 txq_idx; | 920 | u32 txq_idx; |
921 | __le32 reserved2[13]; | 921 | __le32 reserved2[13]; |
922 | } __attribute((packed)); | 922 | } __attribute((packed)); |
923 | 923 | ||
@@ -1118,7 +1118,7 @@ struct map_list { | |||
1118 | struct tx_ring_desc { | 1118 | struct tx_ring_desc { |
1119 | struct sk_buff *skb; | 1119 | struct sk_buff *skb; |
1120 | struct ob_mac_iocb_req *queue_entry; | 1120 | struct ob_mac_iocb_req *queue_entry; |
1121 | int index; | 1121 | u32 index; |
1122 | struct oal oal; | 1122 | struct oal oal; |
1123 | struct map_list map[MAX_SKB_FRAGS + 1]; | 1123 | struct map_list map[MAX_SKB_FRAGS + 1]; |
1124 | int map_cnt; | 1124 | int map_cnt; |
@@ -1131,7 +1131,7 @@ struct bq_desc { | |||
1131 | struct sk_buff *skb; | 1131 | struct sk_buff *skb; |
1132 | } p; | 1132 | } p; |
1133 | __le64 *addr; | 1133 | __le64 *addr; |
1134 | int index; | 1134 | u32 index; |
1135 | DECLARE_PCI_UNMAP_ADDR(mapaddr); | 1135 | DECLARE_PCI_UNMAP_ADDR(mapaddr); |
1136 | DECLARE_PCI_UNMAP_LEN(maplen); | 1136 | DECLARE_PCI_UNMAP_LEN(maplen); |
1137 | }; | 1137 | }; |