Remove support for old-style ethtool ioctl handlers
Subsystems (4)
PATCH 1/1 Remove support for old-style ethtool ioctl handlers
During the transition to the ethtool_ops way of doing things, we supported calling the device's ->do_ioctl method to allow unconverted drivers to continue working. Those days are long behind us, all in-tree drivers use the ethtool_ops way, and so we no longer need to support this.
The bonding driver and ethernet bridge code are the biggest beneficiaries of this; calling the ioctl was unreliable as the context might well not have CAP_SYS_ADMIN.
Thanks to Al Viro for pointing out I missed the bridge code in my first version of this patch.
Signed-off-by Matthew Wilcox <[email protected]>
drivers/net/bonding/bond_main.c +9 -42
@@ -613,38 +613,20 @@ down:static int bond_update_speed_duplex (struct slave *slave) {struct net_device *slave_dev = slave->dev; -static int (* ioctl)(struct net_device *,struct ifreq *,int ); -struct ifreq ifr;struct ethtool_cmd etool; +int res;/* Fake speed and duplex */ slave->speed =SPEED_100 ; slave->duplex =DUPLEX_FULL ; -if (slave_dev->ethtool_ops) { -int res; - -if (!slave_dev->ethtool_ops->get_settings) { -return -1 ; - } - - res = slave_dev->ethtool_ops->get_settings (slave_dev, &etool); -if (res <0 ) { -return -1 ; - } - - goto verify; - } +if (!slave_dev->ethtool_ops || !slave_dev->ethtool_ops->get_settings) +return -1 ; - ioctl = slave_dev->do_ioctl; -strncpy (ifr.ifr_name, slave_dev->name,IFNAMSIZ ); - etool.cmd =ETHTOOL_GSET ; - ifr.ifr_data = (char *)&etool; -if (!ioctl || (IOCTL (slave_dev, &ifr,SIOCETHTOOL ) <0 )) { + res = slave_dev->ethtool_ops->get_settings (slave_dev, &etool); +if (res <0 )return -1 ; - } -verify:switch (etool.speed) {case SPEED_10 :case SPEED_100 :
@@ -690,7 +672,6 @@ static int bond_check_dev_link(struct bostatic int (* ioctl)(struct net_device *,struct ifreq *,int );struct ifreq ifr;struct mii_ioctl_data *mii; -struct ethtool_value etool;if (bond->params.use_carrier) {return netif_carrier_ok (slave_dev) ?BMSR_LSTATUS :0 ;
@@ -721,9 +702,9 @@ static int bond_check_dev_link(struct bo } } -/* try SIOCETHTOOL ioctl, some drivers cache ETHTOOL_GLINK */ -/* for a period of time so we attempt to get link status */ -/* from it last if the above MII ioctls fail... */ +/* some drivers cache ETHTOOL_GLINK for a period of time so we only +* attempt to get link status from it if the above MII ioctls fail. +*/ if (slave_dev->ethtool_ops) {if (slave_dev->ethtool_ops->get_link) {u32 link;
@@ -734,23 +715,9 @@ static int bond_check_dev_link(struct bo } } -if (ioctl) { -strncpy (ifr.ifr_name, slave_dev->name,IFNAMSIZ ); - etool.cmd =ETHTOOL_GLINK ; - ifr.ifr_data = (char *)&etool; -if (IOCTL (slave_dev, &ifr,SIOCETHTOOL ) ==0 ) { -if (etool.data ==1 ) { -return BMSR_LSTATUS ; - }else { -dprintk ("SIOCETHTOOL shows link down\n" ); -return 0 ; - } - } - } -/* * If reporting, report that either there's no dev->do_ioctl, -* or both SIOCGMIIREG and SIOCETHTOOL failed (meaning that we +* or both SIOCGMIIREG and get_link failed (meaning that we * cannot report link status). If not reporting, pretend * we're ok. */
net/8021q/vlan_dev.c +0 -3
@@ -813,9 +813,6 @@ int vlan_dev_ioctl(struct net_device *deif (real_dev->do_ioctl &&netif_device_present (real_dev)) err = real_dev->do_ioctl (real_dev, &ifrr, cmd);break ; - -case SIOCETHTOOL : - err =dev_ethtool (&ifrr); }if (!err)
net/bridge/br_if.c +15 -26
50 lines not on this page · raw message
net/core/ethtool.c +1 -10
@@ -810,7 +810,7 @@ int dev_ethtool(struct ifreq *ifr)return -ENODEV ;if (!dev->ethtool_ops) - goto ioctl; +return -EOPNOTSUPP ;if (copy_from_user (ðcmd, useraddr,sizeof (ethcmd)))return -EFAULT ;
@@ -959,15 +959,6 @@ int dev_ethtool(struct ifreq *ifr)netdev_features_change (dev);return rc; - - ioctl: -/* Keep existing behaviour for the moment. */ -if (!capable (CAP_NET_ADMIN )) -return -EPERM ; - -if (dev->do_ioctl) -return dev->do_ioctl (dev, ifr,SIOCETHTOOL ); -return -EOPNOTSUPP ; }EXPORT_SYMBOL (dev_ethtool);