net: dwc-xlgmac: let core reject the unsupported coalescing parameters
authorJakub Kicinski <kuba@kernel.org>
Mon, 16 Mar 2020 20:47:06 +0000 (13:47 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Mar 2020 03:56:57 +0000 (20:56 -0700)
Set ethtool_ops->supported_coalesce_params to let
the core reject unsupported coalescing parameters.

This driver already correctly rejected all unsupported
parameters.

While at it remove unnecessary zeroing on get.

No functional changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/synopsys/dwc-xlgmac-ethtool.c

index fde7221..bc198ea 100644 (file)
@@ -151,7 +151,6 @@ static int xlgmac_ethtool_get_coalesce(struct net_device *netdev,
 {
        struct xlgmac_pdata *pdata = netdev_priv(netdev);
 
-       memset(ec, 0, sizeof(struct ethtool_coalesce));
        ec->rx_coalesce_usecs = pdata->rx_usecs;
        ec->rx_max_coalesced_frames = pdata->rx_frames;
        ec->tx_max_coalesced_frames = pdata->tx_frames;
@@ -167,20 +166,6 @@ static int xlgmac_ethtool_set_coalesce(struct net_device *netdev,
        unsigned int rx_frames, rx_riwt, rx_usecs;
        unsigned int tx_frames;
 
-       /* Check for not supported parameters */
-       if ((ec->rx_coalesce_usecs_irq) || (ec->rx_max_coalesced_frames_irq) ||
-           (ec->tx_coalesce_usecs) || (ec->tx_coalesce_usecs_high) ||
-           (ec->tx_max_coalesced_frames_irq) || (ec->tx_coalesce_usecs_irq) ||
-           (ec->stats_block_coalesce_usecs) ||  (ec->pkt_rate_low) ||
-           (ec->use_adaptive_rx_coalesce) || (ec->use_adaptive_tx_coalesce) ||
-           (ec->rx_max_coalesced_frames_low) || (ec->rx_coalesce_usecs_low) ||
-           (ec->tx_coalesce_usecs_low) || (ec->tx_max_coalesced_frames_low) ||
-           (ec->pkt_rate_high) || (ec->rx_coalesce_usecs_high) ||
-           (ec->rx_max_coalesced_frames_high) ||
-           (ec->tx_max_coalesced_frames_high) ||
-           (ec->rate_sample_interval))
-               return -EOPNOTSUPP;
-
        rx_usecs = ec->rx_coalesce_usecs;
        rx_riwt = hw_ops->usec_to_riwt(pdata, rx_usecs);
        rx_frames = ec->rx_max_coalesced_frames;
@@ -257,6 +242,8 @@ static void xlgmac_ethtool_get_ethtool_stats(struct net_device *netdev,
 }
 
 static const struct ethtool_ops xlgmac_ethtool_ops = {
+       .supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |
+                                    ETHTOOL_COALESCE_MAX_FRAMES,
        .get_drvinfo = xlgmac_ethtool_get_drvinfo,
        .get_link = ethtool_op_get_link,
        .get_msglevel = xlgmac_ethtool_get_msglevel,