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/via-velocity.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/via-velocity.c')
-rw-r--r-- | drivers/net/via-velocity.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index ced1446dec04..e04e5bee005c 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
@@ -2328,14 +2328,10 @@ static int velocity_mii_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd | |||
2328 | miidata->phy_id = readb(®s->MIIADR) & 0x1f; | 2328 | miidata->phy_id = readb(®s->MIIADR) & 0x1f; |
2329 | break; | 2329 | break; |
2330 | case SIOCGMIIREG: | 2330 | case SIOCGMIIREG: |
2331 | if (!capable(CAP_NET_ADMIN)) | ||
2332 | return -EPERM; | ||
2333 | if (velocity_mii_read(vptr->mac_regs, miidata->reg_num & 0x1f, &(miidata->val_out)) < 0) | 2331 | if (velocity_mii_read(vptr->mac_regs, miidata->reg_num & 0x1f, &(miidata->val_out)) < 0) |
2334 | return -ETIMEDOUT; | 2332 | return -ETIMEDOUT; |
2335 | break; | 2333 | break; |
2336 | case SIOCSMIIREG: | 2334 | case SIOCSMIIREG: |
2337 | if (!capable(CAP_NET_ADMIN)) | ||
2338 | return -EPERM; | ||
2339 | spin_lock_irqsave(&vptr->lock, flags); | 2335 | spin_lock_irqsave(&vptr->lock, flags); |
2340 | err = velocity_mii_write(vptr->mac_regs, miidata->reg_num & 0x1f, miidata->val_in); | 2336 | err = velocity_mii_write(vptr->mac_regs, miidata->reg_num & 0x1f, miidata->val_in); |
2341 | spin_unlock_irqrestore(&vptr->lock, flags); | 2337 | spin_unlock_irqrestore(&vptr->lock, flags); |