Skip to content

Commit aae5e7c

Browse files
Ben Hutchingsdavem330
authored andcommitted
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent c23ddf8 commit aae5e7c

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

drivers/net/ibm_newemac/core.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2218,16 +2218,13 @@ static int emac_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
22182218

22192219
switch (cmd) {
22202220
case SIOCGMIIPHY:
2221-
case SIOCDEVPRIVATE:
22222221
data[0] = dev->phy.address;
22232222
/* Fall through */
22242223
case SIOCGMIIREG:
2225-
case SIOCDEVPRIVATE + 1:
22262224
data[3] = emac_mdio_read(ndev, dev->phy.address, data[1]);
22272225
return 0;
22282226

22292227
case SIOCSMIIREG:
2230-
case SIOCDEVPRIVATE + 2:
22312228
if (!capable(CAP_NET_ADMIN))
22322229
return -EPERM;
22332230
emac_mdio_write(ndev, dev->phy.address, data[1], data[2]);

drivers/net/natsemi.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3053,12 +3053,10 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
30533053

30543054
switch(cmd) {
30553055
case SIOCGMIIPHY: /* Get address of MII PHY in use. */
3056-
case SIOCDEVPRIVATE: /* for binary compat, remove in 2.5 */
30573056
data->phy_id = np->phy_addr_external;
30583057
/* Fall Through */
30593058

30603059
case SIOCGMIIREG: /* Read MII PHY register. */
3061-
case SIOCDEVPRIVATE+1: /* for binary compat, remove in 2.5 */
30623060
/* The phy_id is not enough to uniquely identify
30633061
* the intended target. Therefore the command is sent to
30643062
* the given mii on the current port.
@@ -3077,7 +3075,6 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
30773075
return 0;
30783076

30793077
case SIOCSMIIREG: /* Write MII PHY register. */
3080-
case SIOCDEVPRIVATE+2: /* for binary compat, remove in 2.5 */
30813078
if (!capable(CAP_NET_ADMIN))
30823079
return -EPERM;
30833080
if (dev->if_port == PORT_TP) {

0 commit comments

Comments
 (0)