| 123456789101112131415161718192021222324252627282930313233343536373839 |
- From 2bf7e4a68c42eed909f3c29582e1fb85cb157e35 Mon Sep 17 00:00:00 2001
- From: Jakub Kicinski <[email protected]>
- Date: Tue, 25 Oct 2022 11:51:26 -0700
- Subject: [PATCH 05/21] 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 <[email protected]>
- Link: https://lore.kernel.org/r/[email protected]
- Signed-off-by: Jakub Kicinski <[email protected]>
- ---
- drivers/net/phy/phylink.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
- --- a/drivers/net/phy/phylink.c
- +++ b/drivers/net/phy/phylink.c
- @@ -566,7 +566,7 @@ EXPORT_SYMBOL_GPL(phylink_get_capabiliti
- /**
- * 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
- @@ -587,8 +587,7 @@ void phylink_validate_mask_caps(unsigned
- 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);
-
|
