diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-07-15 13:05:05 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-07-15 13:19:17 -0700 |
| commit | 51b35d4f9d8860b7c181e545a90bc0ad370efbdb (patch) | |
| tree | acde6b56b9ab31e4c8317d3013ca16403b6b9256 /net/ethtool | |
| parent | af58de31bebe737235f0238843f2054996998bd5 (diff) | |
| parent | 0a1868b93fad5938dbcca77286b25bf211c49f7a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.11 net-next PR.
Conflicts:
93c3a96c301f ("net: pse-pd: Do not return EOPNOSUPP if config is null")
4cddb0f15ea9 ("net: ethtool: pse-pd: Fix possible null-deref")
30d7b6727724 ("net: ethtool: Add new power limit get and set features")
https://lore.kernel.org/20240715123204.623520bb@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ethtool')
| -rw-r--r-- | net/ethtool/pse-pd.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ethtool/pse-pd.c b/net/ethtool/pse-pd.c index ba46c9c8b12d..ff81aa749784 100644 --- a/net/ethtool/pse-pd.c +++ b/net/ethtool/pse-pd.c @@ -277,17 +277,21 @@ ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info) tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL]) { struct pse_control_config config = {}; - if (pse_has_podl(phydev->psec)) + if (tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL]) config.podl_admin_control = nla_get_u32(tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL]); - if (pse_has_c33(phydev->psec)) + if (tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL]) config.c33_admin_control = nla_get_u32(tb[ETHTOOL_A_C33_PSE_ADMIN_CONTROL]); + /* pse_ethtool_set_config() will do nothing if the config + * is zero + */ ret = pse_ethtool_set_config(phydev->psec, info->extack, &config); if (ret) return ret; } + /* Return errno or zero - PSE has no notification */ return ret; } |