Skip to content

Commit 4438e9d

Browse files
Govindarajulu Varadarajangregkh
authored andcommitted
enic: do not call enic_change_mtu in enic_probe
commit cb5c656 upstream. In commit ab123fe ("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: ab123fe ("enic: handle mtu change for vf properly") Signed-off-by: Govindarajulu Varadarajan <gvaradar@cisco.com> Signed-off-by: David S. Miller <davem@davemloft.net> Cc: Ben Hutchings <ben.hutchings@codethink.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 55c6de1 commit 4438e9d

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/net/ethernet/cisco/enic/enic_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2681,7 +2681,6 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
26812681
*/
26822682

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

26862685
err = enic_set_mac_addr(netdev, enic->mac_addr);
26872686
if (err) {
@@ -2731,6 +2730,7 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
27312730
netdev->features |= NETIF_F_HIGHDMA;
27322731

27332732
netdev->priv_flags |= IFF_UNICAST_FLT;
2733+
netdev->mtu = enic->port_mtu;
27342734

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

0 commit comments

Comments
 (0)