Commit ebb4a911 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

cxgb3: use ndo_siocdevprivate 



cxgb3 has a private multiplexor that works correctly in compat
mode, split out the siocdevprivate callback from do_ioctl for
simplification.

Cc: Raju Rangoju <rajur@chelsio.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 18787eee

drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c

+8 −4
Original line number Diff line number Diff line
@@ -2135,13 +2135,18 @@ static int in_range(int val, int lo, int hi) 
	return val < 0 || (val <= hi && val >= lo);

}



static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)

static int cxgb_siocdevprivate(struct net_device *dev,

			       struct ifreq *ifreq,

			       void __user *useraddr,

			       int cmd)

{

	struct port_info *pi = netdev_priv(dev);

	struct adapter *adapter = pi->adapter;

	u32 cmd;

	int ret;



	if (cmd != SIOCCHIOCTL)

		return -EOPNOTSUPP;



	if (copy_from_user(&cmd, useraddr, sizeof(cmd)))

		return -EFAULT;
@@ -2546,8 +2551,6 @@ static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd) 
		fallthrough;

	case SIOCGMIIPHY:

		return mdio_mii_ioctl(&pi->phy.mdio, data, cmd);

	case SIOCCHIOCTL:

		return cxgb_extension_ioctl(dev, req->ifr_data);

	default:

		return -EOPNOTSUPP;

	}
@@ -3182,6 +3185,7 @@ static const struct net_device_ops cxgb_netdev_ops = { 
	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_rx_mode	= cxgb_set_rxmode,

	.ndo_do_ioctl		= cxgb_ioctl,

	.ndo_siocdevprivate	= cxgb_siocdevprivate,

	.ndo_change_mtu		= cxgb_change_mtu,

	.ndo_set_mac_address	= cxgb_set_mac_addr,

	.ndo_fix_features	= cxgb_fix_features,