diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-09-03 06:39:43 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-03 23:02:11 -0400 |
commit | 7ab0f2736bfe137a82a7084bbfb5f809da95cabd (patch) | |
tree | e305ec96eceebb285efee4b6fd307822ab257fe6 /drivers/net/pcmcia/axnet_cs.c | |
parent | aae5e7c30fc660c50dfecbdd745799b05af90f01 (diff) |
netdev: Remove redundant checks for CAP_NET_ADMIN in MDIO implementations
dev_ioctl() already checks capable(CAP_NET_ADMIN) before calling the
driver's implementation of MDIO ioctls.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/pcmcia/axnet_cs.c')
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 3b681c1d7523..4f2fef6cf6dc 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -706,8 +706,6 @@ static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
706 | data[3] = mdio_read(mii_addr, data[0], data[1] & 0x1f); | 706 | data[3] = mdio_read(mii_addr, data[0], data[1] & 0x1f); |
707 | return 0; | 707 | return 0; |
708 | case SIOCSMIIREG: /* Write MII PHY register. */ | 708 | case SIOCSMIIREG: /* Write MII PHY register. */ |
709 | if (!capable(CAP_NET_ADMIN)) | ||
710 | return -EPERM; | ||
711 | mdio_write(mii_addr, data[0], data[1] & 0x1f, data[2]); | 709 | mdio_write(mii_addr, data[0], data[1] & 0x1f, data[2]); |
712 | return 0; | 710 | return 0; |
713 | } | 711 | } |