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/cassini.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/cassini.c')
-rw-r--r-- | drivers/net/cassini.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c index 7517dc1da650..05916aafa4f1 100644 --- a/drivers/net/cassini.c +++ b/drivers/net/cassini.c | |||
@@ -4875,10 +4875,6 @@ static int cas_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
4875 | break; | 4875 | break; |
4876 | 4876 | ||
4877 | case SIOCSMIIREG: /* Write MII PHY register. */ | 4877 | case SIOCSMIIREG: /* Write MII PHY register. */ |
4878 | if (!capable(CAP_NET_ADMIN)) { | ||
4879 | rc = -EPERM; | ||
4880 | break; | ||
4881 | } | ||
4882 | spin_lock_irqsave(&cp->lock, flags); | 4878 | spin_lock_irqsave(&cp->lock, flags); |
4883 | cas_mif_poll(cp, 0); | 4879 | cas_mif_poll(cp, 0); |
4884 | rc = cas_phy_write(cp, data->reg_num & 0x1f, data->val_in); | 4880 | rc = cas_phy_write(cp, data->reg_num & 0x1f, data->val_in); |