diff options
| author | Xie Xiaobo <xiaobo.xie@nxp.com> | 2017-12-12 09:41:24 (GMT) |
|---|---|---|
| committer | Xie Xiaobo <xiaobo.xie@nxp.com> | 2017-12-12 09:41:24 (GMT) |
| commit | 96b8b743d2b8ad69614a79a2919b466ab01bb1fe (patch) | |
| tree | 3d4ebdd3e9d053c60dfe02ed79cdc9cebca22e8f /drivers/net/ethernet/freescale/gianfar.c | |
| parent | 708b8b8eb67124716c8579a9e259742b040d4dd3 (diff) | |
| parent | 85464a211ccb5e3874b323623a7cf2f07bce9fc1 (diff) | |
| download | linux-96b8b743d2b8ad69614a79a2919b466ab01bb1fe.tar.xz | |
Merge branch 'linux-4.9-nxp' into linux-4.9 on Dec. 12, 2017
Signed-off-by: Xiaobo Xie <xiaobo.xie@nxp.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/gianfar.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/gianfar.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index fd20688..3a2b08b 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -1787,6 +1787,7 @@ static int init_phy(struct net_device *dev) GFAR_SUPPORTED_GBIT : 0; phy_interface_t interface; struct phy_device *phydev; + struct ethtool_eee edata; priv->oldlink = 0; priv->oldspeed = 0; @@ -1811,6 +1812,10 @@ static int init_phy(struct net_device *dev) /* Add support for flow control, but don't advertise it by default */ phydev->supported |= (SUPPORTED_Pause | SUPPORTED_Asym_Pause); + /* disable EEE autoneg, EEE not supported by eTSEC */ + memset(&edata, 0, sizeof(struct ethtool_eee)); + phy_ethtool_set_eee(phydev, &edata); + return 0; } |