diff --git a/[refs] b/[refs] index 00d62fdb435c..7b3b5a281987 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2098c18d6cf65358dd1620154bdedbc8c8d36f44 +refs/heads/master: 4954936e25cb8ce99a96cac9dd9417d7b639867a diff --git a/trunk/drivers/net/arm/ixp4xx_eth.c b/trunk/drivers/net/arm/ixp4xx_eth.c index db44ebbf45c5..1bbb7b8cb0da 100644 --- a/trunk/drivers/net/arm/ixp4xx_eth.c +++ b/trunk/drivers/net/arm/ixp4xx_eth.c @@ -788,9 +788,11 @@ static void eth_set_mcast_list(struct net_device *dev) static int eth_ioctl(struct net_device *dev, struct ifreq *req, int cmd) { + struct port *port = netdev_priv(dev); + if (!netif_running(dev)) return -EINVAL; - return -EINVAL; + return phy_mii_ioctl(port->phydev, if_mii(req), cmd); }