lkml.org 
[lkml]   [2018]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 071/165] enic: do not call enic_change_mtu in enic_probe
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Govindarajulu Varadarajan <gvaradar@cisco.com>

    [ Upstream commit cb5c6568867325f9905e80c96531d963bec8e5ea ]

    In commit ab123fe071c9 ("enic: handle mtu change for vf properly")
    ASSERT_RTNL() is added to _enic_change_mtu() to prevent it from being
    called without rtnl held. enic_probe() calls enic_change_mtu()
    without rtnl held. At this point netdev is not registered yet.
    Remove call to enic_change_mtu and assign the mtu to netdev->mtu.

    Fixes: ab123fe071c9 ("enic: handle mtu change for vf properly")
    Signed-off-by: Govindarajulu Varadarajan <gvaradar@cisco.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/cisco/enic/enic_main.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/net/ethernet/cisco/enic/enic_main.c
    +++ b/drivers/net/ethernet/cisco/enic/enic_main.c
    @@ -2843,7 +2843,6 @@ static int enic_probe(struct pci_dev *pd
    */

    enic->port_mtu = enic->config.mtu;
    - (void)enic_change_mtu(netdev, enic->port_mtu);

    err = enic_set_mac_addr(netdev, enic->mac_addr);
    if (err) {
    @@ -2930,6 +2929,7 @@ static int enic_probe(struct pci_dev *pd
    /* MTU range: 68 - 9000 */
    netdev->min_mtu = ENIC_MIN_MTU;
    netdev->max_mtu = ENIC_MAX_MTU;
    + netdev->mtu = enic->port_mtu;

    err = register_netdev(netdev);
    if (err) {

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