diff options
author | Todd Foggoa <tfoggoa@cisco.com> | 2016-04-06 09:57:01 -0400 |
---|---|---|
committer | Todd Foggoa <tfoggoa@cisco.com> | 2016-04-06 09:57:01 -0400 |
commit | a292c8c35794531d27a068310a76d067f2ccf56a (patch) | |
tree | 7b3ed299ee3f1c4d5e9b91f7da186ea3d65f596d /dpdk/dpdk-2.2.0_patches/0020-enic-fix-Rx-descriptor-limit.patch | |
parent | 83cc4e140d4fdf915ae027851b442b2ff0a682e8 (diff) |
Fix DPDK patch files so git am works smoothly
Change-Id: Ic2a6e6f1ceea81f2e34f3db370682569327b44ad
Signed-off-by: Todd Foggoa <tfoggoa@cisco.com>
Diffstat (limited to 'dpdk/dpdk-2.2.0_patches/0020-enic-fix-Rx-descriptor-limit.patch')
-rw-r--r-- | dpdk/dpdk-2.2.0_patches/0020-enic-fix-Rx-descriptor-limit.patch | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/dpdk/dpdk-2.2.0_patches/0020-enic-fix-Rx-descriptor-limit.patch b/dpdk/dpdk-2.2.0_patches/0020-enic-fix-Rx-descriptor-limit.patch index f2fb1245482..db2ac64612c 100644 --- a/dpdk/dpdk-2.2.0_patches/0020-enic-fix-Rx-descriptor-limit.patch +++ b/dpdk/dpdk-2.2.0_patches/0020-enic-fix-Rx-descriptor-limit.patch @@ -1,20 +1,22 @@ -commit 65ca78fdf9a684743bfca278cf1fcfea4603931d -Author: Nelson Escobar <neescoba@cisco.com> -Date: Fri Mar 18 11:33:34 2016 -0700 +From ce6badc60736f5e78a295f30fe84c3e40ad0c330 Mon Sep 17 00:00:00 2001 +From: Nelson Escobar <neescoba@cisco.com> +Date: Fri, 18 Mar 2016 11:33:34 -0700 +Subject: [PATCH 20/22] enic: fix Rx descriptor limit - enic: fix Rx descriptor limit - On initialization, the rq descriptor count was set to the limit of the vic. When the requested number of rx descriptors was less than this count, enic_alloc_rq() was incorrectly setting the count to the lower value. This results in later calls to enic_alloc_rq() incorrectly using the lower value as the adapter limit. - + Fixes: fefed3d1e62c ("enic: new driver") - + Signed-off-by: Nelson Escobar <neescoba@cisco.com> Reviewed-by: John Daley <johndale@cisco.com> +--- + drivers/net/enic/enic_main.c | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index e30672c..2f79cf0 100644 @@ -59,3 +61,6 @@ index e30672c..2f79cf0 100644 RTE_CACHE_LINE_SIZE, rq->socket_id); if (rq->mbuf_ring != NULL) +-- +1.9.1 + |