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/e1000e | |
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/e1000e')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 0f8d9619adea..16c193a6c95c 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -4346,8 +4346,6 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, | |||
4346 | data->phy_id = adapter->hw.phy.addr; | 4346 | data->phy_id = adapter->hw.phy.addr; |
4347 | break; | 4347 | break; |
4348 | case SIOCGMIIREG: | 4348 | case SIOCGMIIREG: |
4349 | if (!capable(CAP_NET_ADMIN)) | ||
4350 | return -EPERM; | ||
4351 | switch (data->reg_num & 0x1F) { | 4349 | switch (data->reg_num & 0x1F) { |
4352 | case MII_BMCR: | 4350 | case MII_BMCR: |
4353 | data->val_out = adapter->phy_regs.bmcr; | 4351 | data->val_out = adapter->phy_regs.bmcr; |