aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sky2.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-09-03 06:39:43 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-03 23:02:11 -0400
commit7ab0f2736bfe137a82a7084bbfb5f809da95cabd (patch)
treee305ec96eceebb285efee4b6fd307822ab257fe6 /drivers/net/sky2.c
parentaae5e7c30fc660c50dfecbdd745799b05af90f01 (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/sky2.c')
-rw-r--r--drivers/net/sky2.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index bab591b418df..00bc65a0aac9 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1214,9 +1214,6 @@ static int sky2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
1214 } 1214 }
1215 1215
1216 case SIOCSMIIREG: 1216 case SIOCSMIIREG:
1217 if (!capable(CAP_NET_ADMIN))
1218 return -EPERM;
1219
1220 spin_lock_bh(&sky2->phy_lock); 1217 spin_lock_bh(&sky2->phy_lock);
1221 err = gm_phy_write(hw, sky2->port, data->reg_num & 0x1f, 1218 err = gm_phy_write(hw, sky2->port, data->reg_num & 0x1f,
1222 data->val_in); 1219 data->val_in);