From e0b3ef17f45eb8a6860189306cf0ce5f509a043b Mon Sep 17 00:00:00 2001 From: Jakub Kicinski Date: Tue, 25 Oct 2022 11:51:26 -0700 Subject: [PATCH] phylink: require valid state argument to phylink_validate_mask_caps() state is deferenced earlier in the function, the NULL check is pointless. Since we don't have any crash reports presumably it's safe to assume state is not NULL. Fixes: f392a1846489 ("net: phylink: provide phylink_validate_mask_caps() helper") Reviewed-by: Sean Anderson Link: https://lore.kernel.org/r/20221025185126.1720553-1-kuba@kernel.org Signed-off-by: Jakub Kicinski --- drivers/net/phy/phylink.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 62106c9..88f60e9 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -564,7 +564,7 @@ EXPORT_SYMBOL_GPL(phylink_get_capabilities); /** * phylink_validate_mask_caps() - Restrict link modes based on caps * @supported: ethtool bitmask for supported link modes. - * @state: an (optional) pointer to a &struct phylink_link_state. + * @state: pointer to a &struct phylink_link_state. * @mac_capabilities: bitmask of MAC capabilities * * Calculate the supported link modes based on @mac_capabilities, and restrict @@ -585,8 +585,7 @@ void phylink_validate_mask_caps(unsigned long *supported, phylink_caps_to_linkmodes(mask, caps); linkmode_and(supported, supported, mask); - if (state) - linkmode_and(state->advertising, state->advertising, mask); + linkmode_and(state->advertising, state->advertising, mask); } EXPORT_SYMBOL_GPL(phylink_validate_mask_caps); -- 2.7.4