Skip to content

Commit

Permalink
phylink: require valid state argument to phylink_validate_mask_caps()
Browse files Browse the repository at this point in the history
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: f392a18 ("net: phylink: provide phylink_validate_mask_caps() helper")
Reviewed-by: Sean Anderson <sean.anderson@seco.com>
Link: https://lore.kernel.org/r/20221025185126.1720553-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Jakub Kicinski committed Oct 27, 2022
1 parent d1e96cc commit e0b3ef1
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/net/phy/phylink.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);

Expand Down

0 comments on commit e0b3ef1

Please sign in to comment.