]> git.itanic.dy.fi Git - linux-stable/commitdiff
enic: do not call enic_change_mtu in enic_probe
authorGovindarajulu Varadarajan <gvaradar@cisco.com>
Mon, 30 Jul 2018 16:56:54 +0000 (09:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 31 Jul 2018 21:42:49 +0000 (14:42 -0700)
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>
drivers/net/ethernet/cisco/enic/enic_main.c

index 6b0376123cdeb8136a00e72a564e4f0e61a5abf3..60641e202534109f3d1341607b6c4d413b75f65b 100644 (file)
@@ -2892,7 +2892,6 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         */
 
        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) {
@@ -2982,6 +2981,7 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /* 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) {