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/pcmcia/xirc2ps_cs.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/pcmcia/xirc2ps_cs.c')
| -rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index 68de89167b49..9709dd173ddc 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
| @@ -1575,8 +1575,6 @@ do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
| 1575 | data[3] = mii_rd(ioaddr, data[0] & 0x1f, data[1] & 0x1f); | 1575 | data[3] = mii_rd(ioaddr, data[0] & 0x1f, data[1] & 0x1f); |
| 1576 | break; | 1576 | break; |
| 1577 | case SIOCSMIIREG: /* Write the specified MII register */ | 1577 | case SIOCSMIIREG: /* Write the specified MII register */ |
| 1578 | if (!capable(CAP_NET_ADMIN)) | ||
| 1579 | return -EPERM; | ||
| 1580 | mii_wr(ioaddr, data[0] & 0x1f, data[1] & 0x1f, data[2], 16); | 1578 | mii_wr(ioaddr, data[0] & 0x1f, data[1] & 0x1f, data[2], 16); |
| 1581 | break; | 1579 | break; |
| 1582 | default: | 1580 | default: |