net/bonding: remove local variable shadowing outer one
authorFerruh Yigit <ferruh.yigit@intel.com>
Thu, 19 Nov 2020 11:58:56 +0000 (11:58 +0000)
committerDavid Marchand <david.marchand@redhat.com>
Mon, 11 Jan 2021 09:45:34 +0000 (10:45 +0100)
'retval' is already defined in the function scope, removing the 'retval'
in the block scope.

Fixes: 112891cd27e5 ("net/bonding: add dedicated HW queues for LACP control")
Cc: stable@dpdk.org
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
Acked-by: Min Hu (Connor) <humin29@huawei.com>
drivers/net/bonding/rte_eth_bond_8023ad.c

index 67ca073..5fe004e 100644 (file)
@@ -1334,8 +1334,7 @@ bond_mode_8023ad_handle_slow_pkt(struct bond_dev_private *internals,
                rte_eth_macaddr_get(slave_id, &m_hdr->eth_hdr.s_addr);
 
                if (internals->mode4.dedicated_queues.enabled == 0) {
-                       int retval = rte_ring_enqueue(port->tx_ring, pkt);
-                       if (retval != 0) {
+                       if (rte_ring_enqueue(port->tx_ring, pkt) != 0) {
                                /* reset timer */
                                port->rx_marker_timer = 0;
                                wrn = WRN_TX_QUEUE_FULL;
@@ -1355,8 +1354,7 @@ bond_mode_8023ad_handle_slow_pkt(struct bond_dev_private *internals,
                }
        } else if (likely(subtype == SLOW_SUBTYPE_LACP)) {
                if (internals->mode4.dedicated_queues.enabled == 0) {
-                       int retval = rte_ring_enqueue(port->rx_ring, pkt);
-                       if (retval != 0) {
+                       if (rte_ring_enqueue(port->rx_ring, pkt) != 0) {
                                /* If RX fing full free lacpdu message and drop packet */
                                wrn = WRN_RX_QUEUE_FULL;
                                goto free_out;