summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-09-03 10:38:33 +0000
committerDavid S. Miller <davem@davemloft.net>2009-09-03 20:02:09 -0700
commitaae5e7c30fc660c50dfecbdd745799b05af90f01 (patch)
treef8bf4c313358206189afafc0a8fb9e544a940519
parentc23ddf8f22fc2c871ce476ff917d1208bbe4f3de (diff)
downloadop-kernel-dev-aae5e7c30fc660c50dfecbdd745799b05af90f01.zip
op-kernel-dev-aae5e7c30fc660c50dfecbdd745799b05af90f01.tar.gz
netdev: Remove SIOCDEVPRIVATE aliases for MDIO ioctls
The standard MDIO ioctl numbers are well-established and these should no longer be needed. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ibm_newemac/core.c3
-rw-r--r--drivers/net/natsemi.c3
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index d7579e4..24ae671 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -2218,16 +2218,13 @@ static int emac_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
switch (cmd) {
case SIOCGMIIPHY:
- case SIOCDEVPRIVATE:
data[0] = dev->phy.address;
/* Fall through */
case SIOCGMIIREG:
- case SIOCDEVPRIVATE + 1:
data[3] = emac_mdio_read(ndev, dev->phy.address, data[1]);
return 0;
case SIOCSMIIREG:
- case SIOCDEVPRIVATE + 2:
if (!capable(CAP_NET_ADMIN))
return -EPERM;
emac_mdio_write(ndev, dev->phy.address, data[1], data[2]);
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index bd41351..b52e5d9 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -3053,12 +3053,10 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
switch(cmd) {
case SIOCGMIIPHY: /* Get address of MII PHY in use. */
- case SIOCDEVPRIVATE: /* for binary compat, remove in 2.5 */
data->phy_id = np->phy_addr_external;
/* Fall Through */
case SIOCGMIIREG: /* Read MII PHY register. */
- case SIOCDEVPRIVATE+1: /* for binary compat, remove in 2.5 */
/* The phy_id is not enough to uniquely identify
* the intended target. Therefore the command is sent to
* the given mii on the current port.
@@ -3077,7 +3075,6 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
return 0;
case SIOCSMIIREG: /* Write MII PHY register. */
- case SIOCDEVPRIVATE+2: /* for binary compat, remove in 2.5 */
if (!capable(CAP_NET_ADMIN))
return -EPERM;
if (dev->if_port == PORT_TP) {
OpenPOWER on IntegriCloud