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

Commit ec37a48d authored Oct 21, 2010 by Jesse Gross Committed by David S. Miller Oct 21, 2010

bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.



Some cards don't support changing vlan offloading settings.  Make
Ethtool set_flags return -EINVAL in those cases.

Reported-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 0988c4c7

drivers/net/bnx2.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7528,7 +7528,7 @@ bnx2_set_flags(struct net_device *dev, u32 data)

	if (!(bp->flags & BNX2_FLAG_CAN_KEEP_VLAN) &&		if (!(bp->flags & BNX2_FLAG_CAN_KEEP_VLAN) &&
	!(data & ETH_FLAG_RXVLAN))		!(data & ETH_FLAG_RXVLAN))
	return -EOPNOTSUPP;		return -EINVAL;

	rc = ethtool_op_set_flags(dev, data, ETH_FLAG_RXHASH \| ETH_FLAG_RXVLAN \|		rc = ethtool_op_set_flags(dev, data, ETH_FLAG_RXHASH \| ETH_FLAG_RXVLAN \|
	ETH_FLAG_TXVLAN);		ETH_FLAG_TXVLAN);

drivers/net/bnx2x/bnx2x_ethtool.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1123,7 +1123,7 @@ static int bnx2x_set_flags(struct net_device *dev, u32 data)
	}		}

	if (!(data & ETH_FLAG_RXVLAN))		if (!(data & ETH_FLAG_RXVLAN))
	return -EOPNOTSUPP;		return -EINVAL;

	if ((data & ETH_FLAG_LRO) && bp->rx_csum && bp->disable_tpa)		if ((data & ETH_FLAG_LRO) && bp->rx_csum && bp->disable_tpa)
	return -EINVAL;		return -EINVAL;