[PATCH 1/2] net/nfp: remove duplicated check when setting MAC address

[Kevin Traynor]

On 05/01/2022 10:32, Maxime Gouin wrote:
> reported by code analysis tool C++test (version 10.4):
> 
>> /build/dpdk-20.11/drivers/net/nfp/nfp_net.c
>> 546   Conditions "(hw->ctrl &NFP_NET_CFG_CTRL_ENABLE) &&
>          !! (hw->cap &NFP_NET_CFG_C" is always evaluated to false
>> 547   Condition "! (hw->cap &NFP_NET_CFG_C" is always evaluated to false
> 
> The previous "if" checks exactly the same condition. Removal of duplicate
> code.
> 
> Fixes: 2fe669f4bcd2 ("net/nfp: support MAC address change")
> 

Cc: stable at dpdk.org

> Signed-off-by: Maxime Gouin <maxime.gouin at 6wind.com>
> Reviewed-by: Olivier Matz <olivier.matz at 6wind.com>

Acked-by: Kevin Traynor <ktraynor at redhat.com>

> ---
>   drivers/net/nfp/nfp_common.c | 4 ----
>   1 file changed, 4 deletions(-)
> 
> diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c
> index f8978e803a0f..b26770dbfbe4 100644
> --- a/drivers/net/nfp/nfp_common.c
> +++ b/drivers/net/nfp/nfp_common.c
> @@ -280,10 +280,6 @@ nfp_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
>   		return -EBUSY;
>   	}
>   
> -	if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) &&
> -	    !(hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR))
> -		return -EBUSY;
> -
>   	/* Writing new MAC to the specific port BAR address */
>   	nfp_net_write_mac(hw, (uint8_t *)mac_addr);
>   
>