diff options
| author | David S. Miller | 2018-03-27 17:05:23 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-03-27 17:05:23 +0200 |
| commit | 5f75a1863eb737bc99e3ef3a5fbf9e7207775b97 (patch) | |
| tree | 671b7135bcf55877da5c353d8b740f7c235845d0 /net | |
| parent | liquidio: Removed duplicate Tx queue status check (diff) | |
| parent | net/mlx5e: Add VLAN offload features to hw_enc_features (diff) | |
| download | kernel-qcow2-linux-5f75a1863eb737bc99e3ef3a5fbf9e7207775b97.tar.gz kernel-qcow2-linux-5f75a1863eb737bc99e3ef3a5fbf9e7207775b97.tar.xz kernel-qcow2-linux-5f75a1863eb737bc99e3ef3a5fbf9e7207775b97.zip | |
Merge tag 'mlx5-updates-2018-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
mlx5-updates-2018-03-22 (Misc updates)
This series includes misc updates for mlx5 core and netdev dirver,
Highlights:
From Inbar, three patches to add support for PFC stall prevention
statistics and enable/disable through new ethtool tunable, as requested
from previous submission.
From Moshe, four patches, added more drop counters:
- drop counter for netdev steering miss
- drop counter for when VF logical link is down
- drop counter for when netdev logical link is down.
From Or, three patches to support vlan push/pop offload via tc HW action,
for newer HW (Connectx-5 and onward) via HW steering flow actions rather
than the emulated path for the older HW brands.
And five more misc small trivial patches.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/ethtool.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 157cd9efa4be..bb6e498c6e3d 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -121,6 +121,7 @@ tunable_strings[__ETHTOOL_TUNABLE_COUNT][ETH_GSTRING_LEN] = { [ETHTOOL_ID_UNSPEC] = "Unspec", [ETHTOOL_RX_COPYBREAK] = "rx-copybreak", [ETHTOOL_TX_COPYBREAK] = "tx-copybreak", + [ETHTOOL_PFC_PREVENTION_TOUT] = "pfc-prevention-tout", }; static const char @@ -2311,6 +2312,11 @@ static int ethtool_tunable_valid(const struct ethtool_tunable *tuna) tuna->type_id != ETHTOOL_TUNABLE_U32) return -EINVAL; break; + case ETHTOOL_PFC_PREVENTION_TOUT: + if (tuna->len != sizeof(u16) || + tuna->type_id != ETHTOOL_TUNABLE_U16) + return -EINVAL; + break; default: return -EINVAL; } |