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>

4 files changed, 0 insertions, 8 deletions

diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 382d26520acc..d836af1b9034 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -1124,8 +1124,6 @@ static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                         int saved_window;
                        unsigned long flags;
 
-                        if (!capable(CAP_NET_ADMIN))
-                                return -EPERM;
                         spin_lock_irqsave(&lp->window_lock, flags);
                         saved_window = inw(ioaddr + EL3_CMD) >> 13;
                         EL3WINDOW(4);
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 3b681c1d7523..4f2fef6cf6dc 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -706,8 +706,6 @@ static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         data[3] = mdio_read(mii_addr, data[0], data[1] & 0x1f);
         return 0;
     case SIOCSMIIREG:           /* Write MII PHY register. */
-        if (!capable(CAP_NET_ADMIN))
-            return -EPERM;
         mdio_write(mii_addr, data[0], data[1] & 0x1f, data[2]);
         return 0;
     }
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 9ef1c1bfa83d..8996b45ffffb 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -1204,8 +1204,6 @@ static int ei_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         data[3] = mdio_read(mii_addr, data[0], data[1] & 0x1f);
         return 0;
     case SIOCSMIIREG:           /* Write MII PHY register. */
-        if (!capable(CAP_NET_ADMIN))
-            return -EPERM;
         mdio_write(mii_addr, data[0], data[1] & 0x1f, data[2]);
         return 0;
     }
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)
         data[3] = mii_rd(ioaddr, data[0] & 0x1f, data[1] & 0x1f);
         break;
       case SIOCSMIIREG:         /* Write the specified MII register */
-        if (!capable(CAP_NET_ADMIN))
-            return -EPERM;
         mii_wr(ioaddr, data[0] & 0x1f, data[1] & 0x1f, data[2], 16);
         break;
       default: