Commit f6f508c0 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller

net: bcmgenet: reject unsupported coalescing params

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

This driver did not previously reject all unsupported parameters.
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a0dadb33
...@@ -686,10 +686,6 @@ static int bcmgenet_set_coalesce(struct net_device *dev, ...@@ -686,10 +686,6 @@ static int bcmgenet_set_coalesce(struct net_device *dev,
* always generate an interrupt either after MBDONE packets have been * always generate an interrupt either after MBDONE packets have been
* transmitted, or when the ring is empty. * transmitted, or when the ring is empty.
*/ */
if (ec->tx_coalesce_usecs || ec->tx_coalesce_usecs_high ||
ec->tx_coalesce_usecs_irq || ec->tx_coalesce_usecs_low ||
ec->use_adaptive_tx_coalesce)
return -EOPNOTSUPP;
/* Program all TX queues with the same values, as there is no /* Program all TX queues with the same values, as there is no
* ethtool knob to do coalescing on a per-queue basis * ethtool knob to do coalescing on a per-queue basis
...@@ -1113,6 +1109,9 @@ static int bcmgenet_set_eee(struct net_device *dev, struct ethtool_eee *e) ...@@ -1113,6 +1109,9 @@ static int bcmgenet_set_eee(struct net_device *dev, struct ethtool_eee *e)
/* standard ethtool support functions. */ /* standard ethtool support functions. */
static const struct ethtool_ops bcmgenet_ethtool_ops = { static const struct ethtool_ops bcmgenet_ethtool_ops = {
.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |
ETHTOOL_COALESCE_MAX_FRAMES |
ETHTOOL_COALESCE_USE_ADAPTIVE_RX,
.begin = bcmgenet_begin, .begin = bcmgenet_begin,
.complete = bcmgenet_complete, .complete = bcmgenet_complete,
.get_strings = bcmgenet_get_strings, .get_strings = bcmgenet_get_strings,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment