Commit 64274771 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

net: netxen: let core reject the unsupported coalescing parameters 



Set ethtool_ops->supported_coalesce_params to let
the core reject unsupported coalescing parameters.

As a side effect of these changes the error code for
unsupported params changes from EINVAL to EOPNOTSUPP.

The driver was missing a check for rate_sample_interval.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8078f028

drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c

+3 −18
Original line number Diff line number Diff line
@@ -748,24 +748,7 @@ static int netxen_set_intr_coalesce(struct net_device *netdev, 
	if (ethcoal->rx_coalesce_usecs > 0xffff ||

		ethcoal->rx_max_coalesced_frames > 0xffff ||

		ethcoal->tx_coalesce_usecs > 0xffff ||

		ethcoal->tx_max_coalesced_frames > 0xffff ||

		ethcoal->rx_coalesce_usecs_irq ||

		ethcoal->rx_max_coalesced_frames_irq ||

		ethcoal->tx_coalesce_usecs_irq ||

		ethcoal->tx_max_coalesced_frames_irq ||

		ethcoal->stats_block_coalesce_usecs ||

		ethcoal->use_adaptive_rx_coalesce ||

		ethcoal->use_adaptive_tx_coalesce ||

		ethcoal->pkt_rate_low ||

		ethcoal->rx_coalesce_usecs_low ||

		ethcoal->rx_max_coalesced_frames_low ||

		ethcoal->tx_coalesce_usecs_low ||

		ethcoal->tx_max_coalesced_frames_low ||

		ethcoal->pkt_rate_high ||

		ethcoal->rx_coalesce_usecs_high ||

		ethcoal->rx_max_coalesced_frames_high ||

		ethcoal->tx_coalesce_usecs_high ||

		ethcoal->tx_max_coalesced_frames_high)

		ethcoal->tx_max_coalesced_frames > 0xffff)

		return -EINVAL;



	if (!ethcoal->rx_coalesce_usecs ||
@@ -923,6 +906,8 @@ netxen_get_dump_data(struct net_device *netdev, struct ethtool_dump *dump, 
}



const struct ethtool_ops netxen_nic_ethtool_ops = {

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES,

	.get_drvinfo = netxen_nic_get_drvinfo,

	.get_regs_len = netxen_nic_get_regs_len,

	.get_regs = netxen_nic_get_regs,

CRA Git | Maintained and supported by SUSTech CRA and CCSE