lkml.org 
[lkml]   [2017]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.10 26/63] amd-xgbe: Dont overwrite SFP PHY mod_absent settings
    Date
    4.10-stable review patch.  If anyone has any objections, please let me know.

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

    From: "Lendacky, Thomas" <Thomas.Lendacky@amd.com>


    [ Upstream commit 2697ea5a859b83ca49511dcfd98daf42584eb3cf ]

    If an SFP module is not present, xgbe_phy_sfp_phy_settings() should
    return after applying the default settings. Currently there is no return
    statement and the default settings are overwritten.

    Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
    +++ b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
    @@ -716,6 +716,8 @@ static void xgbe_phy_sfp_phy_settings(st
    pdata->phy.duplex = DUPLEX_UNKNOWN;
    pdata->phy.autoneg = AUTONEG_ENABLE;
    pdata->phy.advertising = pdata->phy.supported;
    +
    + return;
    }

    pdata->phy.advertising &= ~ADVERTISED_Autoneg;

    \
     
     \ /
      Last update: 2017-03-20 19:17    [W:3.351 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site