Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1b59947 authored by Stefan Sørensen's avatar Stefan Sørensen Committed by David S. Miller
Browse files

net:cpsw: Pass unhandled ioctl's on to generic phy ioctl 



This patch allows the use of a generic timestamping phy connected
to the cpsw if CPTS support is not enabled. This also adds support
of the SIOCGMIIREG and SIOCSMIIREG, and moves handling of SIOCGMIIPHY
to the generic driver.

Signed-off-by: default avatarStefan Sørensen <stefan.sorensen@spectralink.com>
Reviewed-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ada0f863

drivers/net/ethernet/ti/cpsw.c

+3 −7
Original line number Diff line number Diff line
@@ -1471,7 +1471,6 @@ static int cpsw_hwtstamp_get(struct net_device *dev, struct ifreq *ifr) 
static int cpsw_ndo_ioctl(struct net_device *dev, struct ifreq *req, int cmd)

{

	struct cpsw_priv *priv = netdev_priv(dev);

	struct mii_ioctl_data *data = if_mii(req);

	int slave_no = cpsw_slave_index(priv);



	if (!netif_running(dev))
@@ -1484,14 +1483,11 @@ static int cpsw_ndo_ioctl(struct net_device *dev, struct ifreq *req, int cmd) 
	case SIOCGHWTSTAMP:

		return cpsw_hwtstamp_get(dev, req);

#endif

	case SIOCGMIIPHY:

		data->phy_id = priv->slaves[slave_no].phy->addr;

		break;

	default:

		return -ENOTSUPP;

	}



	return 0;

	if (!priv->slaves[slave_no].phy)

		return -EOPNOTSUPP;

	return phy_mii_ioctl(priv->slaves[slave_no].phy, req, cmd);

}



static void cpsw_ndo_tx_timeout(struct net_device *ndev)