git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/mlx5: move Linux-specific functions
[dpdk.git]
/
drivers
/
net
/
sfc
/
sfc.c
diff --git
a/drivers/net/sfc/sfc.c
b/drivers/net/sfc/sfc.c
index
dea57b2
..
c19d81c
100644
(file)
--- a/
drivers/net/sfc/sfc.c
+++ b/
drivers/net/sfc/sfc.c
@@
-1,7
+1,7
@@
/* SPDX-License-Identifier: BSD-3-Clause
*
/* 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.
*
* This software was jointly developed between OKTET Labs (under contract
* for Solarflare) and Solarflare Communications, Inc.
@@
-30,7
+30,7
@@
sfc_dma_alloc(const struct sfc_adapter *sa, const char *name, uint16_t id,
{
const struct rte_memzone *mz;
{
const struct rte_memzone *mz;
- sfc_log_init(sa, "name=%s id=%u len=%
l
u socket_id=%d",
+ sfc_log_init(sa, "name=%s id=%u len=%
z
u socket_id=%d",
name, id, len, socket_id);
mz = rte_eth_dma_zone_reserve(sa->eth_dev, name, id, len,
name, id, len, socket_id);
mz = rte_eth_dma_zone_reserve(sa->eth_dev, name, id, len,
@@
-148,7
+148,8
@@
sfc_check_conf(struct sfc_adapter *sa)
rc = EINVAL;
}
rc = EINVAL;
}
- if (conf->intr_conf.rxq != 0) {
+ if (conf->intr_conf.rxq != 0 &&
+ (sa->priv.dp_rx->features & SFC_DP_RX_FEAT_INTR) == 0) {
sfc_err(sa, "Receive queue interrupt not supported");
rc = EINVAL;
}
sfc_err(sa, "Receive queue interrupt not supported");
rc = EINVAL;
}
@@
-240,8
+241,8
@@
sfc_estimate_resource_limits(struct sfc_adapter *sa)
return 0;
fail_get_vi_pool:
return 0;
fail_get_vi_pool:
-fail_nic_init:
efx_nic_fini(sa->nic);
efx_nic_fini(sa->nic);
+fail_nic_init:
return rc;
}
return rc;
}