Skip to content

Commit cb5c656

Browse files
Govindarajulu Varadarajandavem330
authored andcommitted
enic: do not call enic_change_mtu in enic_probe
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 4672694 commit cb5c656

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

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

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

28972896
err = enic_set_mac_addr(netdev, enic->mac_addr);
28982897
if (err) {
@@ -2982,6 +2981,7 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
29822981
/* MTU range: 68 - 9000 */
29832982
netdev->min_mtu = ENIC_MIN_MTU;
29842983
netdev->max_mtu = ENIC_MAX_MTU;
2984+
netdev->mtu = enic->port_mtu;
29852985

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

0 commit comments

Comments
 (0)