lkml.org 
[lkml]   [2018]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 26/61] qed: Fix mask parameter in qed_vf_prep_tunn_req_tlv
    Date
    From: Nathan Chancellor <natechancellor@gmail.com>

    [ Upstream commit db803f36e56f23b5a2266807e190d1dc11554d54 ]

    Clang complains when one enumerated type is implicitly converted to
    another.

    drivers/net/ethernet/qlogic/qed/qed_vf.c:686:6: warning: implicit
    conversion from enumeration type 'enum qed_tunn_mode' to different
    enumeration type 'enum qed_tunn_clss' [-Wenum-conversion]
    QED_MODE_L2GENEVE_TUNN,
    ^~~~~~~~~~~~~~~~~~~~~~

    Update mask's parameter to expect qed_tunn_mode, which is what was
    intended.

    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_vf.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/qlogic/qed/qed_vf.c b/drivers/net/ethernet/qlogic/qed/qed_vf.c
    index 6eb85db69f9a..b8b1a791a4fa 100644
    --- a/drivers/net/ethernet/qlogic/qed/qed_vf.c
    +++ b/drivers/net/ethernet/qlogic/qed/qed_vf.c
    @@ -572,7 +572,7 @@ int qed_vf_hw_prepare(struct qed_hwfn *p_hwfn)
    static void
    __qed_vf_prep_tunn_req_tlv(struct vfpf_update_tunn_param_tlv *p_req,
    struct qed_tunn_update_type *p_src,
    - enum qed_tunn_clss mask, u8 *p_cls)
    + enum qed_tunn_mode mask, u8 *p_cls)
    {
    if (p_src->b_update_mode) {
    p_req->tun_mode_update_mask |= BIT(mask);
    @@ -587,7 +587,7 @@ __qed_vf_prep_tunn_req_tlv(struct vfpf_update_tunn_param_tlv *p_req,
    static void
    qed_vf_prep_tunn_req_tlv(struct vfpf_update_tunn_param_tlv *p_req,
    struct qed_tunn_update_type *p_src,
    - enum qed_tunn_clss mask,
    + enum qed_tunn_mode mask,
    u8 *p_cls, struct qed_tunn_update_udp_port *p_port,
    u8 *p_update_port, u16 *p_udp_port)
    {
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-10-16 06:27    [W:4.068 / U:0.656 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site