diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-09-03 06:38:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-03 23:02:09 -0400 |
commit | aae5e7c30fc660c50dfecbdd745799b05af90f01 (patch) | |
tree | f8bf4c313358206189afafc0a8fb9e544a940519 /drivers/net | |
parent | c23ddf8f22fc2c871ce476ff917d1208bbe4f3de (diff) |
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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ibm_newemac/core.c | 3 | ||||
-rw-r--r-- | drivers/net/natsemi.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index d7579e4feefc..24ae671e4cb2 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) | |||
2218 | 2218 | ||
2219 | switch (cmd) { | 2219 | switch (cmd) { |
2220 | case SIOCGMIIPHY: | 2220 | case SIOCGMIIPHY: |
2221 | case SIOCDEVPRIVATE: | ||
2222 | data[0] = dev->phy.address; | 2221 | data[0] = dev->phy.address; |
2223 | /* Fall through */ | 2222 | /* Fall through */ |
2224 | case SIOCGMIIREG: | 2223 | case SIOCGMIIREG: |
2225 | case SIOCDEVPRIVATE + 1: | ||
2226 | data[3] = emac_mdio_read(ndev, dev->phy.address, data[1]); | 2224 | data[3] = emac_mdio_read(ndev, dev->phy.address, data[1]); |
2227 | return 0; | 2225 | return 0; |
2228 | 2226 | ||
2229 | case SIOCSMIIREG: | 2227 | case SIOCSMIIREG: |
2230 | case SIOCDEVPRIVATE + 2: | ||
2231 | if (!capable(CAP_NET_ADMIN)) | 2228 | if (!capable(CAP_NET_ADMIN)) |
2232 | return -EPERM; | 2229 | return -EPERM; |
2233 | emac_mdio_write(ndev, dev->phy.address, data[1], data[2]); | 2230 | emac_mdio_write(ndev, dev->phy.address, data[1], data[2]); |
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index bd41351e4e26..b52e5d98a3b7 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) | |||
3053 | 3053 | ||
3054 | switch(cmd) { | 3054 | switch(cmd) { |
3055 | case SIOCGMIIPHY: /* Get address of MII PHY in use. */ | 3055 | case SIOCGMIIPHY: /* Get address of MII PHY in use. */ |
3056 | case SIOCDEVPRIVATE: /* for binary compat, remove in 2.5 */ | ||
3057 | data->phy_id = np->phy_addr_external; | 3056 | data->phy_id = np->phy_addr_external; |
3058 | /* Fall Through */ | 3057 | /* Fall Through */ |
3059 | 3058 | ||
3060 | case SIOCGMIIREG: /* Read MII PHY register. */ | 3059 | case SIOCGMIIREG: /* Read MII PHY register. */ |
3061 | case SIOCDEVPRIVATE+1: /* for binary compat, remove in 2.5 */ | ||
3062 | /* The phy_id is not enough to uniquely identify | 3060 | /* The phy_id is not enough to uniquely identify |
3063 | * the intended target. Therefore the command is sent to | 3061 | * the intended target. Therefore the command is sent to |
3064 | * the given mii on the current port. | 3062 | * the given mii on the current port. |
@@ -3077,7 +3075,6 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
3077 | return 0; | 3075 | return 0; |
3078 | 3076 | ||
3079 | case SIOCSMIIREG: /* Write MII PHY register. */ | 3077 | case SIOCSMIIREG: /* Write MII PHY register. */ |
3080 | case SIOCDEVPRIVATE+2: /* for binary compat, remove in 2.5 */ | ||
3081 | if (!capable(CAP_NET_ADMIN)) | 3078 | if (!capable(CAP_NET_ADMIN)) |
3082 | return -EPERM; | 3079 | return -EPERM; |
3083 | if (dev->if_port == PORT_TP) { | 3080 | if (dev->if_port == PORT_TP) { |