update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / dpdk / drivers / net / sfc / sfc_ev.c

diff --git a/ceph/src/spdk/dpdk/drivers/net/sfc/sfc_ev.c b/ceph/src/spdk/dpdk/drivers/net/sfc/sfc_ev.c
index 59928332a304b21f79f7c0805b05901e22bf5df4..83115e87758b737dfc480c224b272e4034352867 100644 (file)
--- a/ceph/src/spdk/dpdk/drivers/net/sfc/sfc_ev.c
+++ b/ceph/src/spdk/dpdk/drivers/net/sfc/sfc_ev.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright (c) 2016-2018 Solarflare Communications Inc.
- * All rights reserved.
+ * Copyright(c) 2019-2020 Xilinx, Inc.
+ * Copyright(c) 2016-2019 Solarflare Communications Inc.
  *
  * This software was jointly developed between OKTET Labs (under contract
  * for Solarflare) and Solarflare Communications, Inc.
@@ -420,7 +420,7 @@ sfc_ev_link_change(void *arg, efx_link_mode_t link_mode)
        struct rte_eth_link new_link;
 
        sfc_port_link_mode_to_info(link_mode, &new_link);
-       if (rte_eth_linkstatus_set(sa->eth_dev, &new_link))
+       if (rte_eth_linkstatus_set(sa->eth_dev, &new_link) == 0)
                evq->sa->port.lsc_seq++;
 
        return B_FALSE;
@@ -602,7 +602,8 @@ sfc_ev_qstart(struct sfc_evq *evq, unsigned int hw_index)
        (void)memset((void *)esmp->esm_base, 0xff,
                     efx_evq_size(sa->nic, evq->entries));
 
-       if (sa->intr.lsc_intr && hw_index == sa->mgmt_evq_index)
+       if ((sa->intr.lsc_intr && hw_index == sa->mgmt_evq_index) ||
+           (sa->intr.rxq_intr && evq->dp_rxq != NULL))
                evq_flags |= EFX_EVQ_FLAGS_NOTIFY_INTERRUPT;
        else
                evq_flags |= EFX_EVQ_FLAGS_NOTIFY_DISABLED;