From a1edda361520f80c68e56380c097b125b375261c Mon Sep 17 00:00:00 2001

From: Jakub Kicinski <kuba@kernel.org>

Date: Thu, 12 Mar 2020 21:07:55 -0700

Subject: [Backport a1edda361520] net: sky2: 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>

---

 src/sky2.c | 4 ++++

 1 file changed, 4 insertions(+)

diff --git a/src/sky2.c b/src/sky2.c

index ebfd0ceac884d9afb7a623f013595ced19eabac0..241f007169797b8a21e4496610b700698bd1d8c1 100644

--- a/src/sky2.c

+++ b/src/sky2.c

@@ -4400,6 +4400,10 @@ static int sky2_set_features(struct net_device *dev, netdev_features_t features)

 }

 static const struct ethtool_ops sky2_ethtool_ops = {

+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

+				     ETHTOOL_COALESCE_MAX_FRAMES |

+				     ETHTOOL_COALESCE_RX_USECS_IRQ |

+				     ETHTOOL_COALESCE_RX_MAX_FRAMES_IRQ,

 	.get_drvinfo	= sky2_get_drvinfo,

 	.get_wol	= sky2_get_wol,

 	.set_wol	= sky2_set_wol,

-- 

2.31.1