Skip to content

Commit

Permalink
netdev: Make ethtool_ops::set_flags() return -EINVAL for unsupported …
Browse files Browse the repository at this point in the history
…flags

The documented error code for attempts to set unsupported flags (or
to clear flags that cannot be disabled) is EINVAL, not EOPNOTSUPP.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ben Hutchings authored and David S. Miller committed Jun 30, 2010
1 parent 1437ce3 commit 97d1935
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/net/bnx2x_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -10983,7 +10983,7 @@ static int bnx2x_set_flags(struct net_device *dev, u32 data)
int rc = 0;

if (data & ~(ETH_FLAG_LRO | ETH_FLAG_RXHASH))
return -EOPNOTSUPP;
return -EINVAL;

if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
printk(KERN_ERR "Handling parity error recovery. Try again later\n");
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/netxen/netxen_nic_ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ static int netxen_nic_set_flags(struct net_device *netdev, u32 data)
int hw_lro;

if (data & ~ETH_FLAG_LRO)
return -EOPNOTSUPP;
return -EINVAL;

if (!(adapter->capabilities & NX_FW_CAPABILITY_HW_LRO))
return -EINVAL;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/qlcnic/qlcnic_ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -984,7 +984,7 @@ static int qlcnic_set_flags(struct net_device *netdev, u32 data)
int hw_lro;

if (data & ~ETH_FLAG_LRO)
return -EOPNOTSUPP;
return -EINVAL;

if (!(adapter->capabilities & QLCNIC_FW_CAPABILITY_HW_LRO))
return -EINVAL;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/s2io.c
Original file line number Diff line number Diff line change
Expand Up @@ -6692,7 +6692,7 @@ static int s2io_ethtool_set_flags(struct net_device *dev, u32 data)
int changed = 0;

if (data & ~ETH_FLAG_LRO)
return -EOPNOTSUPP;
return -EINVAL;

if (data & ETH_FLAG_LRO) {
if (lro_enable) {
Expand Down

0 comments on commit 97d1935

Please sign in to comment.