Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ab0f273 authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

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: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aae5e7c3

drivers/net/amd8111e.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -1524,9 +1524,6 @@ static int amd8111e_ioctl(struct net_device * dev , struct ifreq *ifr, int cmd) 
	int err;

	int err;

	u32 mii_regval;

	u32 mii_regval;





	if (!capable(CAP_NET_ADMIN))

		return -EPERM;



	switch(cmd) {

	switch(cmd) {

	case SIOCGMIIPHY:

	case SIOCGMIIPHY:

		data->phy_id = lp->ext_phy_addr;

		data->phy_id = lp->ext_phy_addr;

drivers/net/atl1c/atl1c_main.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -534,10 +534,6 @@ static int atl1c_mii_ioctl(struct net_device *netdev, 
		break;

		break;





	case SIOCGMIIREG:

	case SIOCGMIIREG:

		if (!capable(CAP_NET_ADMIN)) {

			retval = -EPERM;

			goto out;

		}

		if (atl1c_read_phy_reg(&adapter->hw, data->reg_num & 0x1F,

		if (atl1c_read_phy_reg(&adapter->hw, data->reg_num & 0x1F,

				    &data->val_out)) {

				    &data->val_out)) {

			retval = -EIO;

			retval = -EIO;
@@ -546,10 +542,6 @@ static int atl1c_mii_ioctl(struct net_device *netdev, 
		break;

		break;





	case SIOCSMIIREG:

	case SIOCSMIIREG:

		if (!capable(CAP_NET_ADMIN)) {

			retval = -EPERM;

			goto out;

		}

		if (data->reg_num & ~(0x1F)) {

		if (data->reg_num & ~(0x1F)) {

			retval = -EFAULT;

			retval = -EFAULT;

			goto out;

			goto out;

drivers/net/atl1e/atl1e_main.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -453,10 +453,6 @@ static int atl1e_mii_ioctl(struct net_device *netdev, 
		break;

		break;





	case SIOCGMIIREG:

	case SIOCGMIIREG:

		if (!capable(CAP_NET_ADMIN)) {

			retval = -EPERM;

			goto out;

		}

		if (atl1e_read_phy_reg(&adapter->hw, data->reg_num & 0x1F,

		if (atl1e_read_phy_reg(&adapter->hw, data->reg_num & 0x1F,

				    &data->val_out)) {

				    &data->val_out)) {

			retval = -EIO;

			retval = -EIO;
@@ -465,10 +461,6 @@ static int atl1e_mii_ioctl(struct net_device *netdev, 
		break;

		break;





	case SIOCSMIIREG:

	case SIOCSMIIREG:

		if (!capable(CAP_NET_ADMIN)) {

			retval = -EPERM;

			goto out;

		}

		if (data->reg_num & ~(0x1F)) {

		if (data->reg_num & ~(0x1F)) {

			retval = -EFAULT;

			retval = -EFAULT;

			goto out;

			goto out;

drivers/net/atlx/atl2.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -966,8 +966,6 @@ static int atl2_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) 
		data->phy_id = 0;

		data->phy_id = 0;

		break;

		break;

	case SIOCGMIIREG:

	case SIOCGMIIREG:

		if (!capable(CAP_NET_ADMIN))

			return -EPERM;

		spin_lock_irqsave(&adapter->stats_lock, flags);

		spin_lock_irqsave(&adapter->stats_lock, flags);

		if (atl2_read_phy_reg(&adapter->hw,

		if (atl2_read_phy_reg(&adapter->hw,

			data->reg_num & 0x1F, &data->val_out)) {

			data->reg_num & 0x1F, &data->val_out)) {
@@ -977,8 +975,6 @@ static int atl2_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) 
		spin_unlock_irqrestore(&adapter->stats_lock, flags);

		spin_unlock_irqrestore(&adapter->stats_lock, flags);

		break;

		break;

	case SIOCSMIIREG:

	case SIOCSMIIREG:

		if (!capable(CAP_NET_ADMIN))

			return -EPERM;

		if (data->reg_num & ~(0x1F))

		if (data->reg_num & ~(0x1F))

			return -EFAULT;

			return -EFAULT;

		spin_lock_irqsave(&adapter->stats_lock, flags);

		spin_lock_irqsave(&adapter->stats_lock, flags);

drivers/net/bnx2.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -7480,9 +7480,6 @@ bnx2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
	}

	}





	case SIOCSMIIREG:

	case SIOCSMIIREG:

		if (!capable(CAP_NET_ADMIN))

			return -EPERM;



		if (bp->phy_flags & BNX2_PHY_FLAG_REMOTE_PHY_CAP)

		if (bp->phy_flags & BNX2_PHY_FLAG_REMOTE_PHY_CAP)

			return -EOPNOTSUPP;

			return -EOPNOTSUPP;