| Message ID | 20180924214212.22522-1-natechancellor@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | qed: Avoid implicit enum conversion in qed_iwarp_parse_rx_pkt | expand |
From: Nathan Chancellor <natechancellor@gmail.com> Date: Mon, 24 Sep 2018 14:42:12 -0700 > Clang warns when one enumerated type is implicitly converted to another. > > drivers/net/ethernet/qlogic/qed/qed_iwarp.c:1713:25: warning: implicit > conversion from enumeration type 'enum tcp_ip_version' to different > enumeration type 'enum qed_tcp_ip_version' [-Wenum-conversion] > cm_info->ip_version = TCP_IPV4; > ~ ^~~~~~~~ > drivers/net/ethernet/qlogic/qed/qed_iwarp.c:1733:25: warning: implicit > conversion from enumeration type 'enum tcp_ip_version' to different > enumeration type 'enum qed_tcp_ip_version' [-Wenum-conversion] > cm_info->ip_version = TCP_IPV6; > ~ ^~~~~~~~ > 2 warnings generated. > > Use the appropriate values from the expected type, qed_tcp_ip_version: > > TCP_IPV4 = QED_TCP_IPV4 = 0 > TCP_IPV6 = QED_TCP_IPV6 = 1 > > Link: https://github.com/ClangBuiltLinux/linux/issues/125 > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Applied.
diff --git a/drivers/net/ethernet/qlogic/qed/qed_iwarp.c b/drivers/net/ethernet/qlogic/qed/qed_iwarp.c index 17f3dfa2cc94..e860bdf0f752 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_iwarp.c +++ b/drivers/net/ethernet/qlogic/qed/qed_iwarp.c @@ -1710,7 +1710,7 @@ qed_iwarp_parse_rx_pkt(struct qed_hwfn *p_hwfn, cm_info->local_ip[0] = ntohl(iph->daddr); cm_info->remote_ip[0] = ntohl(iph->saddr); - cm_info->ip_version = TCP_IPV4; + cm_info->ip_version = QED_TCP_IPV4; ip_hlen = (iph->ihl) * sizeof(u32); *payload_len = ntohs(iph->tot_len) - ip_hlen; @@ -1730,7 +1730,7 @@ qed_iwarp_parse_rx_pkt(struct qed_hwfn *p_hwfn, cm_info->remote_ip[i] = ntohl(ip6h->saddr.in6_u.u6_addr32[i]); } - cm_info->ip_version = TCP_IPV6; + cm_info->ip_version = QED_TCP_IPV6; ip_hlen = sizeof(*ip6h); *payload_len = ntohs(ip6h->payload_len);
Clang warns when one enumerated type is implicitly converted to another. drivers/net/ethernet/qlogic/qed/qed_iwarp.c:1713:25: warning: implicit conversion from enumeration type 'enum tcp_ip_version' to different enumeration type 'enum qed_tcp_ip_version' [-Wenum-conversion] cm_info->ip_version = TCP_IPV4; ~ ^~~~~~~~ drivers/net/ethernet/qlogic/qed/qed_iwarp.c:1733:25: warning: implicit conversion from enumeration type 'enum tcp_ip_version' to different enumeration type 'enum qed_tcp_ip_version' [-Wenum-conversion] cm_info->ip_version = TCP_IPV6; ~ ^~~~~~~~ 2 warnings generated. Use the appropriate values from the expected type, qed_tcp_ip_version: TCP_IPV4 = QED_TCP_IPV4 = 0 TCP_IPV6 = QED_TCP_IPV6 = 1 Link: https://github.com/ClangBuiltLinux/linux/issues/125 Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> --- drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)