From a292c8c35794531d27a068310a76d067f2ccf56a Mon Sep 17 00:00:00 2001 From: Todd Foggoa Date: Wed, 6 Apr 2016 09:57:01 -0400 Subject: Fix DPDK patch files so git am works smoothly Change-Id: Ic2a6e6f1ceea81f2e34f3db370682569327b44ad Signed-off-by: Todd Foggoa --- ...-fix-crash-when-allocating-too-many-queues.patch | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'dpdk/dpdk-2.2.0_patches/0015-enic-fix-crash-when-allocating-too-many-queues.patch') diff --git a/dpdk/dpdk-2.2.0_patches/0015-enic-fix-crash-when-allocating-too-many-queues.patch b/dpdk/dpdk-2.2.0_patches/0015-enic-fix-crash-when-allocating-too-many-queues.patch index f8e661fc831..2c0e65d3bbb 100644 --- a/dpdk/dpdk-2.2.0_patches/0015-enic-fix-crash-when-allocating-too-many-queues.patch +++ b/dpdk/dpdk-2.2.0_patches/0015-enic-fix-crash-when-allocating-too-many-queues.patch @@ -1,19 +1,21 @@ -commit ddf2da3ecec97a316838f40fe13e217afafc6252 -Author: Nelson Escobar -Date: Thu Mar 17 15:49:58 2016 -0700 +From 7a7fa2891df4ec4af0c34f3bbd203e1376e83951 Mon Sep 17 00:00:00 2001 +From: Nelson Escobar +Date: Thu, 17 Mar 2016 15:49:58 -0700 +Subject: [PATCH 15/22] enic: fix crash when allocating too many queues - enic: fix crash when allocating too many queues - Add checks to make sure we don't try to allocate more tx or rx queues than we support. - + Fixes: fefed3d1e62c ("enic: new driver") - + Signed-off-by: Nelson Escobar Reviewed-by: John Daley +--- + drivers/net/enic/enic_ethdev.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c -index bab0f7d..4969476 100644 +index 6f2ada5..6c3c734 100644 --- a/drivers/net/enic/enic_ethdev.c +++ b/drivers/net/enic/enic_ethdev.c @@ -174,6 +174,13 @@ static int enicpmd_dev_tx_queue_setup(struct rte_eth_dev *eth_dev, @@ -44,3 +46,6 @@ index bab0f7d..4969476 100644 eth_dev->data->rx_queues[queue_idx] = (void *)&enic->rq[queue_idx]; ret = enic_alloc_rq(enic, queue_idx, socket_id, mp, nb_desc); +-- +1.9.1 + -- cgit 1.2.3-korg