lkml.org 
[lkml]   [2018]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 033/150] qed: Avoid implicit enum conversion in qed_iwarp_parse_rx_pkt
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 77f2d753819b7d50c16abfb778caf1fe075faed0 ]

    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>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/qlogic/qed/qed_iwarp.c b/drivers/net/ethernet/qlogic/qed/qed_iwarp.c
    index 90a2b53096e2..51bbb0e5b514 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);
    --
    2.17.1


    \
     
     \ /
      Last update: 2018-11-02 20:26    [W:4.937 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site