]> git.droids-corp.org - dpdk.git/commitdiff
net/nfp: remove duplicated check when setting MAC address
authorMaxime Gouin <maxime.gouin@6wind.com>
Wed, 5 Jan 2022 10:32:02 +0000 (11:32 +0100)
committerFerruh Yigit <ferruh.yigit@intel.com>
Fri, 21 Jan 2022 13:49:41 +0000 (14:49 +0100)
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@dpdk.org
Signed-off-by: Maxime Gouin <maxime.gouin@6wind.com>
Reviewed-by: Olivier Matz <olivier.matz@6wind.com>
Acked-by: Kevin Traynor <ktraynor@redhat.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
drivers/net/nfp/nfp_common.c

index f8978e803a0fa01e5729b2b805242bfdf3319019..b26770dbfbe4c8889e487145b752b08828b1fe85 100644 (file)
@@ -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);