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/0018-enic-remove-packet-error-conditional.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/0018-enic-remove-packet-error-conditional.patch')
| -rw-r--r-- | dpdk/dpdk-2.2.0_patches/0018-enic-remove-packet-error-conditional.patch | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/dpdk/dpdk-2.2.0_patches/0018-enic-remove-packet-error-conditional.patch b/dpdk/dpdk-2.2.0_patches/0018-enic-remove-packet-error-conditional.patch index d3084c84c9e..3f29f6ea999 100644 --- a/dpdk/dpdk-2.2.0_patches/0018-enic-remove-packet-error-conditional.patch +++ b/dpdk/dpdk-2.2.0_patches/0018-enic-remove-packet-error-conditional.patch @@ -1,12 +1,14 @@ -commit 50765c820e98a4434efbc0a58df4b9d78afb7a5f -Author: John Daley <johndale@cisco.com> -Date: Thu Mar 17 15:57:07 2016 -0700 +From 2fa6a45ff9f9fb3108b09403e32393416bd0a732 Mon Sep 17 00:00:00 2001 +From: John Daley <johndale@cisco.com> +Date: Thu, 17 Mar 2016 15:57:07 -0700 +Subject: [PATCH 18/22] enic: remove packet error conditional - enic: remove packet error conditional - small cleanup to remove conditional. - + Signed-off-by: John Daley <johndale@cisco.com> +--- + drivers/net/enic/enic_rx.c | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/net/enic/enic_rx.c b/drivers/net/enic/enic_rx.c index 817a891..232987a 100644 @@ -51,3 +53,6 @@ index 817a891..232987a 100644 /* prefetch mbuf data for caller */ rte_packet_prefetch(RTE_PTR_ADD(rxmb->buf_addr, +-- +1.9.1 + |