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/sungem.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/sungem.c')
| -rw-r--r-- | drivers/net/sungem.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index e0dfdd24647..305ec3d783d 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
| @@ -2852,9 +2852,7 @@ static int gem_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 2852 | break; | 2852 | break; |
| 2853 | 2853 | ||
| 2854 | case SIOCSMIIREG: /* Write MII PHY register. */ | 2854 | case SIOCSMIIREG: /* Write MII PHY register. */ |
| 2855 | if (!capable(CAP_NET_ADMIN)) | 2855 | if (!gp->running) |
| 2856 | rc = -EPERM; | ||
| 2857 | else if (!gp->running) | ||
| 2858 | rc = -EAGAIN; | 2856 | rc = -EAGAIN; |
| 2859 | else { | 2857 | else { |
| 2860 | __phy_write(gp, data->phy_id & 0x1f, data->reg_num & 0x1f, | 2858 | __phy_write(gp, data->phy_id & 0x1f, data->reg_num & 0x1f, |