net: hns: reject unsupported coalescing params

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

This driver did not previously reject unsupported parameters.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
index 717fccc2efba9c3c7f27d0caa1f67350e3c42745..49624acf24739a085bd75f8d548979dd63660fe4 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
@@ -1264,6 +1264,11 @@ static int hns_get_rxnfc(struct net_device *netdev,
 }
 
 static const struct ethtool_ops hns_ethtool_ops = {
+       .supported_coalesce_params = ETHTOOL_COALESCE_USECS |
+                                    ETHTOOL_COALESCE_MAX_FRAMES |
+                                    ETHTOOL_COALESCE_USE_ADAPTIVE |
+                                    ETHTOOL_COALESCE_USECS_LOW_HIGH |
+                                    ETHTOOL_COALESCE_MAX_FRAMES_LOW_HIGH,
        .get_drvinfo = hns_nic_get_drvinfo,
        .get_link  = hns_nic_get_link,
        .get_ringparam = hns_get_ringparam,

diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index acfce915a02b8af43f2d356941c0bba631730037..be355f37337d7de31c1e8ad7b1ad98dfe3c436cb 100644 (file)
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -214,6 +214,11 @@ bool ethtool_convert_link_mode_to_legacy_u32(u32 *legacy_u32,
 #define ETHTOOL_COALESCE_USECS_LOW_HIGH                                        \
        (ETHTOOL_COALESCE_RX_USECS_LOW | ETHTOOL_COALESCE_TX_USECS_LOW | \
         ETHTOOL_COALESCE_RX_USECS_HIGH | ETHTOOL_COALESCE_TX_USECS_HIGH)
+#define ETHTOOL_COALESCE_MAX_FRAMES_LOW_HIGH   \
+       (ETHTOOL_COALESCE_RX_MAX_FRAMES_LOW |   \
+        ETHTOOL_COALESCE_TX_MAX_FRAMES_LOW |   \
+        ETHTOOL_COALESCE_RX_MAX_FRAMES_HIGH |  \
+        ETHTOOL_COALESCE_TX_MAX_FRAMES_HIGH)
 #define ETHTOOL_COALESCE_PKT_RATE_RX_USECS                             \
        (ETHTOOL_COALESCE_USE_ADAPTIVE_RX |                             \
         ETHTOOL_COALESCE_RX_USECS_LOW | ETHTOOL_COALESCE_RX_USECS_HIGH | \