diff options
| author | Ingo Molnar <[email protected]> | 2025-04-16 05:03:04 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2025-04-16 05:03:58 +0000 |
| commit | 06e09002bc1d46505d6b3bd947ebaf3cec7acab8 (patch) | |
| tree | da8b8a243b23ed3e5d9d790878924d65bc463b14 /net/ethtool/common.c | |
| parent | x86/cpufeatures: Shorten X86_FEATURE_AMD_HETEROGENEOUS_CORES (diff) | |
| parent | Merge tag 'edac_urgent_for_v6.15_rc3' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| download | kernel-06e09002bc1d46505d6b3bd947ebaf3cec7acab8.tar.gz kernel-06e09002bc1d46505d6b3bd947ebaf3cec7acab8.zip | |
Merge branch 'linus' into x86/cpu, to resolve conflicts
Conflicts:
tools/arch/x86/include/asm/cpufeatures.h
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'net/ethtool/common.c')
| -rw-r--r-- | net/ethtool/common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ethtool/common.c b/net/ethtool/common.c index 0cb6da1f692a..49bea6b45bd5 100644 --- a/net/ethtool/common.c +++ b/net/ethtool/common.c @@ -830,6 +830,7 @@ void ethtool_ringparam_get_cfg(struct net_device *dev, /* Driver gives us current state, we want to return current config */ kparam->tcp_data_split = dev->cfg->hds_config; + kparam->hds_thresh = dev->cfg->hds_thresh; } static void ethtool_init_tsinfo(struct kernel_ethtool_ts_info *info) |