diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2020-04-30 21:59:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-04-30 17:39:15 -0700 |
| commit | 81496b72e9ba1999d4ed7bb7fa407a1edef020a4 (patch) | |
| tree | 5cc4206fb21ba30d22bf24248c14ccd8c2577b14 | |
| parent | 2b3e48b66516602d7d63142cda84b554f908eb54 (diff) | |
| download | linux-81496b72e9ba1999d4ed7bb7fa407a1edef020a4.tar.bz2 | |
r8169: add check for invalid parameter combination in rtl_set_coalesce
Realtek provided information about a HW constraint that time limit must
not be set to 0 if the frame limit is >0. Add a check for this and
reject invalid parameter combinations.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 4fe8b1d35b69..aa3e63e031da 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -1908,6 +1908,11 @@ static int rtl_set_coalesce(struct net_device *dev, struct ethtool_coalesce *ec) if (tx_fr == 1) tx_fr = 0; + /* HW requires time limit to be set if frame limit is set */ + if ((tx_fr && !ec->tx_coalesce_usecs) || + (rx_fr && !ec->rx_coalesce_usecs)) + return -EINVAL; + w |= FIELD_PREP(RTL_COALESCE_TX_FRAMES, DIV_ROUND_UP(tx_fr, 4)); w |= FIELD_PREP(RTL_COALESCE_RX_FRAMES, DIV_ROUND_UP(rx_fr, 4)); |