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 | 4a8b1180970b22d04a1f4efaae1c2643d651e48d (patch) | |
tree | b6b5e4c8480da852ef324d7cf7c4adf8ecd6b3b2 | |
parent | 13f477e1bee29372f788e1950f479df1efeb81da (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>
-rw-r--r-- | e1000_main.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/e1000_main.c b/e1000_main.c index 2c723b1..c66dd4f 100644 --- a/e1000_main.c +++ b/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; |