iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cxgb3: use ndo_siocdevprivate

Browse Source 
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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnd Bergmann 2021-07-27 15:45:03 +02:00 committed by David S. Miller
parent 18787eeebd
commit ebb4a911e0
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
View File

@ -2135,13 +2135,18 @@ static int in_range(int val, int lo, int hi)
return val < 0 || (val <= hi && val >= lo); 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 port_info *pi = netdev_priv(dev);
struct adapter *adapter = pi->adapter; struct adapter *adapter = pi->adapter;
u32 cmd;
int ret; int ret;
if (cmd != SIOCCHIOCTL)
return -EOPNOTSUPP;
if (copy_from_user(&cmd, useraddr, sizeof(cmd))) if (copy_from_user(&cmd, useraddr, sizeof(cmd)))
return -EFAULT; return -EFAULT;
@ -2546,8 +2551,6 @@ static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
fallthrough; fallthrough;
case SIOCGMIIPHY: case SIOCGMIIPHY:
return mdio_mii_ioctl(&pi->phy.mdio, data, cmd); return mdio_mii_ioctl(&pi->phy.mdio, data, cmd);
case SIOCCHIOCTL:
return cxgb_extension_ioctl(dev, req->ifr_data);
default: default:
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
@ -3182,6 +3185,7 @@ static const struct net_device_ops cxgb_netdev_ops = {
.ndo_validate_addr = eth_validate_addr, .ndo_validate_addr = eth_validate_addr,
.ndo_set_rx_mode = cxgb_set_rxmode, .ndo_set_rx_mode = cxgb_set_rxmode,
.ndo_do_ioctl = cxgb_ioctl, .ndo_do_ioctl = cxgb_ioctl,
.ndo_siocdevprivate = cxgb_siocdevprivate,
.ndo_change_mtu = cxgb_change_mtu, .ndo_change_mtu = cxgb_change_mtu,
.ndo_set_mac_address = cxgb_set_mac_addr, .ndo_set_mac_address = cxgb_set_mac_addr,
.ndo_fix_features = cxgb_fix_features, .ndo_fix_features = cxgb_fix_features,