aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/natsemi.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-09-03 06:39:43 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-03 23:02:11 -0400
commit7ab0f2736bfe137a82a7084bbfb5f809da95cabd (patch)
treee305ec96eceebb285efee4b6fd307822ab257fe6 /drivers/net/natsemi.c
parentaae5e7c30fc660c50dfecbdd745799b05af90f01 (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/natsemi.c')
-rw-r--r--drivers/net/natsemi.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index b52e5d98a3b7..b2722c44337e 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -3075,8 +3075,6 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
3075 return 0; 3075 return 0;
3076 3076
3077 case SIOCSMIIREG: /* Write MII PHY register. */ 3077 case SIOCSMIIREG: /* Write MII PHY register. */
3078 if (!capable(CAP_NET_ADMIN))
3079 return -EPERM;
3080 if (dev->if_port == PORT_TP) { 3078 if (dev->if_port == PORT_TP) {
3081 if ((data->phy_id & 0x1f) == np->phy_addr_external) { 3079 if ((data->phy_id & 0x1f) == np->phy_addr_external) {
3082 if ((data->reg_num & 0x1f) == MII_ADVERTISE) 3080 if ((data->reg_num & 0x1f) == MII_ADVERTISE)