mirror of
git://nv-tegra.nvidia.com/linux-nv-oot.git
synced 2025-12-22 17:25:35 +03:00
nvethernet: Remove MAC START ioctl
Issue: MAC START and STOP IOCTL are deprecated, so these IOCTL calls has internally generated failure for Linux OSD. Fix: Remove MAC START IOCTL from Linux OSD. Bug 3889287 Change-Id: I19684936d22dac35df5af2393e163f51118fc8ce Signed-off-by: Mohan Thadikamalla <mohant@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2824816 Reviewed-by: Bhadram Varka <vbhadram@nvidia.com> Reviewed-by: Narayan Reddy <narayanr@nvidia.com> Reviewed-by: Ashutosh Jha <ajha@nvidia.com> GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
committed by
mobile promotions
parent
7fb44152e2
commit
2b21d4a86e
@@ -2633,15 +2633,6 @@ static int ether_open(struct net_device *dev)
|
|||||||
/* Init EEE configuration */
|
/* Init EEE configuration */
|
||||||
ether_init_eee_params(pdata);
|
ether_init_eee_params(pdata);
|
||||||
|
|
||||||
/* Start the MAC */
|
|
||||||
ioctl_data.cmd = OSI_CMD_START_MAC;
|
|
||||||
ret = osi_handle_ioctl(pdata->osi_core, &ioctl_data);
|
|
||||||
if (ret < 0) {
|
|
||||||
dev_err(&dev->dev,
|
|
||||||
"%s: failed to start MAC %d\n",
|
|
||||||
__func__, ret);
|
|
||||||
goto err_r_irq;
|
|
||||||
}
|
|
||||||
/* start PHY */
|
/* start PHY */
|
||||||
phy_start(pdata->phydev);
|
phy_start(pdata->phydev);
|
||||||
|
|
||||||
@@ -6660,14 +6651,6 @@ static int ether_resume(struct ether_priv_data *pdata)
|
|||||||
|
|
||||||
/* enable NAPI */
|
/* enable NAPI */
|
||||||
ether_napi_enable(pdata);
|
ether_napi_enable(pdata);
|
||||||
/* start the mac */
|
|
||||||
ioctl_data.cmd = OSI_CMD_START_MAC;
|
|
||||||
ret = osi_handle_ioctl(osi_core, &ioctl_data);
|
|
||||||
if (ret < 0) {
|
|
||||||
dev_err(dev,
|
|
||||||
"%s: failed to start MAC %d\n", __func__, ret);
|
|
||||||
goto err_start_mac;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pdata->phydev && !(device_may_wakeup(&ndev->dev))) {
|
if (pdata->phydev && !(device_may_wakeup(&ndev->dev))) {
|
||||||
/* configure phy init */
|
/* configure phy init */
|
||||||
@@ -6696,9 +6679,9 @@ static int ether_resume(struct ether_priv_data *pdata)
|
|||||||
#endif /* MACSEC_SUPPORT */
|
#endif /* MACSEC_SUPPORT */
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
err_start_mac:
|
|
||||||
ether_napi_disable(pdata);
|
|
||||||
err_dma:
|
err_dma:
|
||||||
|
ether_napi_disable(pdata);
|
||||||
osi_hw_core_deinit(osi_core);
|
osi_hw_core_deinit(osi_core);
|
||||||
err_resume:
|
err_resume:
|
||||||
free_dma_resources(pdata);
|
free_dma_resources(pdata);
|
||||||
|
|||||||
Reference in New Issue
Block a user