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/igb | |
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/igb')
-rw-r--r-- | drivers/net/igb/igb_main.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 90b0b1b91730..943186b78483 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -4914,8 +4914,6 @@ static int igb_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | |||
4914 | data->phy_id = adapter->hw.phy.addr; | 4914 | data->phy_id = adapter->hw.phy.addr; |
4915 | break; | 4915 | break; |
4916 | case SIOCGMIIREG: | 4916 | case SIOCGMIIREG: |
4917 | if (!capable(CAP_NET_ADMIN)) | ||
4918 | return -EPERM; | ||
4919 | if (igb_read_phy_reg(&adapter->hw, data->reg_num & 0x1F, | 4917 | if (igb_read_phy_reg(&adapter->hw, data->reg_num & 0x1F, |
4920 | &data->val_out)) | 4918 | &data->val_out)) |
4921 | return -EIO; | 4919 | return -EIO; |