diff options
| author |   Stas Sergeev <stsp@list.ru> | 2015-04-01 19:23:29 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-04-06 16:35:40 -0400 |
| commit | ecf7b361a6bc1fd5441e4d6a3d7433abbe577064 (patch) | |
| tree | fe3cb6ccda9686c987c01b36faa368a1812bb6a9 /drivers/net/ethernet/marvell | |
| parent | ipv6: protect skb->sk accesses from recursive dereference inside the stack (diff) | |
| download | linux-dev-ecf7b361a6bc1fd5441e4d6a3d7433abbe577064.tar.xz linux-dev-ecf7b361a6bc1fd5441e4d6a3d7433abbe577064.zip | |
mvneta: dont call mvneta_adjust_link() manually
mvneta_adjust_link() is a callback for of_phy_connect() and should
not be called directly. The result of calling it directly is as below:
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvneta.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 96208f17bb53..2db653225a0e 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -2658,16 +2658,11 @@ static int mvneta_stop(struct net_device *dev) static int mvneta_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) { struct mvneta_port *pp = netdev_priv(dev); - int ret; if (!pp->phy_dev) return -ENOTSUPP; - ret = phy_mii_ioctl(pp->phy_dev, ifr, cmd); - if (!ret) - mvneta_adjust_link(dev); - - return ret; + return phy_mii_ioctl(pp->phy_dev, ifr, cmd); } /* Ethtool methods */ |