diff options
| author | Govindarajulu Varadarajan <gvaradar@cisco.com> | 2018-07-30 09:56:54 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-31 14:42:49 -0700 |
| commit | cb5c6568867325f9905e80c96531d963bec8e5ea (patch) | |
| tree | 3748398fddd87e28c8cec4952f22458c48bdf0bf | |
| parent | 4672694bd4f1aebdab0ad763ae4716e89cb15221 (diff) | |
| download | op-kernel-dev-cb5c6568867325f9905e80c96531d963bec8e5ea.zip op-kernel-dev-cb5c6568867325f9905e80c96531d963bec8e5ea.tar.gz | |
enic: do not call enic_change_mtu in enic_probe
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>
| -rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index 6b03761..60641e20 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c @@ -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) { |
