lkml.org 
[lkml]   [2018]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.17 067/324] qed: Do not advertise DCBX_LLD_MANAGED capability.
    Date
    4.17-stable review patch.  If anyone has any objections, please let me know.

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

    From: Sudarsana Reddy Kalluru <sudarsana.kalluru@cavium.com>

    [ Upstream commit ff54d5cd9ec15546abc870452dd0b66eef4b4606 ]

    Do not advertise DCBX_LLD_MANAGED capability i.e., do not allow
    external agent to manage the dcbx/lldp negotiation. MFW acts as lldp agent
    for qed* devices, and no other lldp agent is allowed to coexist with mfw.

    Also updated a debug print, to not to display the redundant info.

    Fixes: a1d8d8a51 ("qed: Add dcbnl support.")
    Signed-off-by: Sudarsana Reddy Kalluru <Sudarsana.Kalluru@cavium.com>
    Signed-off-by: Ariel Elior <ariel.elior@cavium.com>
    Signed-off-by: Michal Kalderon <Michal.Kalderon@cavium.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 11 ++++-------
    1 file changed, 4 insertions(+), 7 deletions(-)

    --- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
    +++ b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
    @@ -255,9 +255,8 @@ qed_dcbx_get_app_protocol_type(struct qe
    *type = DCBX_PROTOCOL_ROCE_V2;
    } else {
    *type = DCBX_MAX_PROTOCOL_TYPE;
    - DP_ERR(p_hwfn,
    - "No action required, App TLV id = 0x%x app_prio_bitmap = 0x%x\n",
    - id, app_prio_bitmap);
    + DP_ERR(p_hwfn, "No action required, App TLV entry = 0x%x\n",
    + app_prio_bitmap);
    return false;
    }

    @@ -1469,8 +1468,8 @@ static u8 qed_dcbnl_getcap(struct qed_de
    *cap = 0x80;
    break;
    case DCB_CAP_ATTR_DCBX:
    - *cap = (DCB_CAP_DCBX_LLD_MANAGED | DCB_CAP_DCBX_VER_CEE |
    - DCB_CAP_DCBX_VER_IEEE | DCB_CAP_DCBX_STATIC);
    + *cap = (DCB_CAP_DCBX_VER_CEE | DCB_CAP_DCBX_VER_IEEE |
    + DCB_CAP_DCBX_STATIC);
    break;
    default:
    *cap = false;
    @@ -1538,8 +1537,6 @@ static u8 qed_dcbnl_getdcbx(struct qed_d
    if (!dcbx_info)
    return 0;

    - if (dcbx_info->operational.enabled)
    - mode |= DCB_CAP_DCBX_LLD_MANAGED;
    if (dcbx_info->operational.ieee)
    mode |= DCB_CAP_DCBX_VER_IEEE;
    if (dcbx_info->operational.cee)

    \
     
     \ /
      Last update: 2018-08-23 10:45    [W:4.821 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site