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/3c574_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/3c574_cs.c')
-rw-r--r-- | drivers/net/pcmcia/3c574_cs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index 382d26520acc..d836af1b9034 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c | |||
@@ -1124,8 +1124,6 @@ static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
1124 | int saved_window; | 1124 | int saved_window; |
1125 | unsigned long flags; | 1125 | unsigned long flags; |
1126 | 1126 | ||
1127 | if (!capable(CAP_NET_ADMIN)) | ||
1128 | return -EPERM; | ||
1129 | spin_lock_irqsave(&lp->window_lock, flags); | 1127 | spin_lock_irqsave(&lp->window_lock, flags); |
1130 | saved_window = inw(ioaddr + EL3_CMD) >> 13; | 1128 | saved_window = inw(ioaddr + EL3_CMD) >> 13; |
1131 | EL3WINDOW(4); | 1129 | EL3WINDOW(4); |