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/atl1e/atl1e_main.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/atl1e/atl1e_main.c')
-rw-r--r-- | drivers/net/atl1e/atl1e_main.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index bca127e65f95..69b830f4b68f 100644 --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c | |||
@@ -453,10 +453,6 @@ static int atl1e_mii_ioctl(struct net_device *netdev, | |||
453 | break; | 453 | break; |
454 | 454 | ||
455 | case SIOCGMIIREG: | 455 | case SIOCGMIIREG: |
456 | if (!capable(CAP_NET_ADMIN)) { | ||
457 | retval = -EPERM; | ||
458 | goto out; | ||
459 | } | ||
460 | if (atl1e_read_phy_reg(&adapter->hw, data->reg_num & 0x1F, | 456 | if (atl1e_read_phy_reg(&adapter->hw, data->reg_num & 0x1F, |
461 | &data->val_out)) { | 457 | &data->val_out)) { |
462 | retval = -EIO; | 458 | retval = -EIO; |
@@ -465,10 +461,6 @@ static int atl1e_mii_ioctl(struct net_device *netdev, | |||
465 | break; | 461 | break; |
466 | 462 | ||
467 | case SIOCSMIIREG: | 463 | case SIOCSMIIREG: |
468 | if (!capable(CAP_NET_ADMIN)) { | ||
469 | retval = -EPERM; | ||
470 | goto out; | ||
471 | } | ||
472 | if (data->reg_num & ~(0x1F)) { | 464 | if (data->reg_num & ~(0x1F)) { |
473 | retval = -EFAULT; | 465 | retval = -EFAULT; |
474 | goto out; | 466 | goto out; |