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 | 7ab0f2736bfe137a82a7084bbfb5f809da95cabd (patch) | |
| tree | e305ec96eceebb285efee4b6fd307822ab257fe6 /drivers/net/tulip | |
| parent | netdev: Remove SIOCDEVPRIVATE aliases for MDIO ioctls (diff) | |
| download | linux-dev-7ab0f2736bfe137a82a7084bbfb5f809da95cabd.tar.xz linux-dev-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/tulip')
| -rw-r--r-- | drivers/net/tulip/tulip_core.c | 2 | ||||
| -rw-r--r-- | drivers/net/tulip/winbond-840.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index b89b73c0b30b..6b2330e4206e 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c @@ -923,8 +923,6 @@ static int private_ioctl (struct net_device *dev, struct ifreq *rq, int cmd) return 0; case SIOCSMIIREG: /* Write MII PHY register. */ - if (!capable (CAP_NET_ADMIN)) - return -EPERM; if (regnum & ~0x1f) return -EINVAL; if (data->phy_id == phy) { diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index 3e59397e5386..b38d3b7f6e35 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c @@ -1470,8 +1470,6 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) return 0; case SIOCSMIIREG: /* Write MII PHY register. */ - if (!capable(CAP_NET_ADMIN)) - return -EPERM; spin_lock_irq(&np->lock); mdio_write(dev, data->phy_id & 0x1f, data->reg_num & 0x1f, data->val_in); spin_unlock_irq(&np->lock); |