Merged,
Maxim.
On 02/26/16 17:02, Matias Elo wrote:
Increase maximum descriptor count to support NICs with up to
64 input/output queues. Related debug messages are also
improved.
Signed-off-by: Matias Elo <[email protected]>
---
platform/linux-generic/include/odp_packet_netmap.h | 2 +-
platform/linux-generic/pktio/netmap.c | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/platform/linux-generic/include/odp_packet_netmap.h
b/platform/linux-generic/include/odp_packet_netmap.h
index 26a8da1..b7990d9 100644
--- a/platform/linux-generic/include/odp_packet_netmap.h
+++ b/platform/linux-generic/include/odp_packet_netmap.h
@@ -17,7 +17,7 @@
#include <linux/if_ether.h>
#include <net/if.h>
-#define NM_MAX_DESC 32
+#define NM_MAX_DESC 64
/** Ring for mapping pktin/pktout queues to netmap descriptors */
struct netmap_ring_t {
diff --git a/platform/linux-generic/pktio/netmap.c
b/platform/linux-generic/pktio/netmap.c
index 0554171..168b76a 100644
--- a/platform/linux-generic/pktio/netmap.c
+++ b/platform/linux-generic/pktio/netmap.c
@@ -288,7 +288,8 @@ static int netmap_open(odp_pktio_t id ODP_UNUSED,
pktio_entry_t *pktio_entry,
goto error;
}
if (desc->nifp->ni_rx_rings > NM_MAX_DESC) {
- ODP_ERR("Unable to store all rx rings\n");
+ ODP_ERR("Unable to store all %" PRIu32 " rx rings (max %d)\n",
+ desc->nifp->ni_rx_rings, NM_MAX_DESC);
nm_close(desc);
goto error;
}
@@ -298,7 +299,8 @@ static int netmap_open(odp_pktio_t id ODP_UNUSED,
pktio_entry_t *pktio_entry,
pkt_nm->capa.max_input_queues = desc->nifp->ni_rx_rings;
if (desc->nifp->ni_tx_rings > NM_MAX_DESC) {
- ODP_ERR("Unable to store all tx rings\n");
+ ODP_ERR("Unable to store all %" PRIu32 " tx rings (max %d)\n",
+ desc->nifp->ni_tx_rings, NM_MAX_DESC);
nm_close(desc);
goto error;
}
_______________________________________________
lng-odp mailing list
[email protected]
https://lists.linaro.org/mailman/listinfo/lng-odp
