Commit 673e63c6 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by David S. Miller
Browse files

net: fix ethtool->set_flags not intended -EINVAL return value 



After commit d5dbda23 "ethtool: Add
support for vlan accleration.", drivers that have NETIF_F_HW_VLAN_TX,
and/or NETIF_F_HW_VLAN_RX feature, but do not allow enable/disable vlan
acceleration via ethtool set_flags, always return -EINVAL from that
function. Fix by returning -EINVAL only if requested features do not
match current settings and can not be changed by driver.

Change any driver that define ethtool->set_flags to use
ethtool_invalid_flags() to avoid similar problems in the future
(also on drivers that do not have the problem).

Tested with modified (to reproduce this bug) myri10ge driver.

Cc: stable@kernel.org # 2.6.37+
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b5845f98

drivers/net/netxen/netxen_nic_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ static int netxen_nic_set_flags(struct net_device *netdev, u32 data) 
	struct netxen_adapter *adapter = netdev_priv(netdev);

	int hw_lro;



	if (data & ~ETH_FLAG_LRO)

	if (ethtool_invalid_flags(netdev, data, ETH_FLAG_LRO))

		return -EINVAL;



	if (!(adapter->capabilities & NX_FW_CAPABILITY_HW_LRO))

drivers/net/qlcnic/qlcnic_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -1003,7 +1003,7 @@ static int qlcnic_set_flags(struct net_device *netdev, u32 data) 
	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	int hw_lro;



	if (data & ~ETH_FLAG_LRO)

	if (ethtool_invalid_flags(netdev, data, ETH_FLAG_LRO))

		return -EINVAL;



	if (!(adapter->capabilities & QLCNIC_FW_CAPABILITY_HW_LRO))

drivers/net/s2io.c

+1 −1
Original line number Diff line number Diff line
@@ -6726,7 +6726,7 @@ static int s2io_ethtool_set_flags(struct net_device *dev, u32 data) 
	int rc = 0;

	int changed = 0;



	if (data & ~ETH_FLAG_LRO)

	if (ethtool_invalid_flags(dev, data, ETH_FLAG_LRO))

		return -EINVAL;



	if (data & ETH_FLAG_LRO) {

drivers/net/vmxnet3/vmxnet3_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -304,8 +304,8 @@ vmxnet3_set_flags(struct net_device *netdev, u32 data) 
	u8 lro_present = (netdev->features & NETIF_F_LRO) == 0 ? 0 : 1;

	unsigned long flags;



	if (data & ~ETH_FLAG_LRO)

		return -EOPNOTSUPP;

	if (ethtool_invalid_flags(netdev, data, ETH_FLAG_LRO))

		return -EINVAL;



	if (lro_requested ^ lro_present) {

		/* toggle the LRO feature*/

drivers/net/vxge/vxge-ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -1117,8 +1117,8 @@ static int vxge_set_flags(struct net_device *dev, u32 data) 
	struct vxgedev *vdev = netdev_priv(dev);

	enum vxge_hw_status status;



	if (data & ~ETH_FLAG_RXHASH)

		return -EOPNOTSUPP;

	if (ethtool_invalid_flags(dev, data, ETH_FLAG_RXHASH))

		return -EINVAL;



	if (!!(data & ETH_FLAG_RXHASH) == vdev->devh->config.rth_en)

		return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE