diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2009-09-03 12:39:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-04 05:02:11 +0200 |
| commit | 7ab0f2736bfe137a82a7084bbfb5f809da95cabd (patch) | |
| tree | e305ec96eceebb285efee4b6fd307822ab257fe6 /drivers/net/e1000 | |
| parent | netdev: Remove SIOCDEVPRIVATE aliases for MDIO ioctls (diff) | |
| download | linux-7ab0f2736bfe137a82a7084bbfb5f809da95cabd.tar.xz 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/e1000')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 2c723b1b8820..c66dd4f9437c 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -4714,8 +4714,6 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, data->phy_id = hw->phy_addr; break; case SIOCGMIIREG: - if (!capable(CAP_NET_ADMIN)) - return -EPERM; spin_lock_irqsave(&adapter->stats_lock, flags); if (e1000_read_phy_reg(hw, data->reg_num & 0x1F, &data->val_out)) { @@ -4725,8 +4723,6 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, spin_unlock_irqrestore(&adapter->stats_lock, flags); break; case SIOCSMIIREG: - if (!capable(CAP_NET_ADMIN)) - return -EPERM; if (data->reg_num & ~(0x1F)) return -EFAULT; mii_reg = data->val_in; |