diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-09-03 10:39:43 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-03 20:02:11 -0700 |
commit | 7ab0f2736bfe137a82a7084bbfb5f809da95cabd (patch) | |
tree | e305ec96eceebb285efee4b6fd307822ab257fe6 /drivers/net/sungem.c | |
parent | aae5e7c30fc660c50dfecbdd745799b05af90f01 (diff) | |
download | linux-7ab0f2736bfe137a82a7084bbfb5f809da95cabd.tar.gz linux-7ab0f2736bfe137a82a7084bbfb5f809da95cabd.tar.bz2 linux-7ab0f2736bfe137a82a7084bbfb5f809da95cabd.zip |
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/sungem.c')
-rw-r--r-- | drivers/net/sungem.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index e0dfdd246470..305ec3d783db 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -2852,9 +2852,7 @@ static int gem_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) break; case SIOCSMIIREG: /* Write MII PHY register. */ - if (!capable(CAP_NET_ADMIN)) - rc = -EPERM; - else if (!gp->running) + if (!gp->running) rc = -EAGAIN; else { __phy_write(gp, data->phy_id & 0x1f, data->reg_num & 0x1f, |