diff options
| author |   Damjan Marion <damarion@cisco.com> | 2016-11-15 12:50:28 +0100 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2016-11-23 22:12:25 +0000 |
| commit | 676554935a576db9f512b8b2ef81ba6723bb7ad6 (patch) | |
| tree | 796b94d3320e097789c5d6bc12f442f4cea9c2a1 /vnet/vnet/ipsec/ipsec.h | |
| parent | daa2cd1512ac46dfe116b89a34caf19a71994c45 (diff) | |
dpdk: remove rte_mbuf modifications at many places in the code
It is sole responsibility of dpdk tx function to fill/update
rte_mbuf prior to sending packet do PMD.
Change-Id: I8ca1dba3e7bef41034d36e3525831849f7ac4ac0
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vnet/vnet/ipsec/ipsec.h')
| -rw-r--r-- | vnet/vnet/ipsec/ipsec.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/vnet/vnet/ipsec/ipsec.h b/vnet/vnet/ipsec/ipsec.h index dbbb928fc30..d33df383669 100644 --- a/vnet/vnet/ipsec/ipsec.h +++ b/vnet/vnet/ipsec/ipsec.h @@ -12,10 +12,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#if DPDK==1 -#include <vnet/devices/dpdk/dpdk.h> -#endif - #define IPSEC_FLAG_IPSEC_GRE_TUNNEL (1 << 0) #define foreach_ipsec_policy_action \ @@ -280,12 +276,6 @@ int ipsec_set_interface_key (vnet_main_t * vnm, u32 hw_if_index, always_inline void ipsec_alloc_empty_buffers (vlib_main_t * vm, ipsec_main_t * im) { -#if DPDK==1 - dpdk_main_t *dm = &dpdk_main; - u32 free_list_index = dm->vlib_buffer_free_list_index; -#else - u32 free_list_index = VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX; -#endif u32 cpu_index = os_get_cpu_number (); uword l = vec_len (im->empty_buffers[cpu_index]); uword n_alloc = 0; @@ -297,11 +287,8 @@ ipsec_alloc_empty_buffers (vlib_main_t * vm, ipsec_main_t * im) vec_alloc (im->empty_buffers[cpu_index], 2 * VLIB_FRAME_SIZE); } - n_alloc = vlib_buffer_alloc_from_free_list (vm, - im->empty_buffers[cpu_index] - + l, - 2 * VLIB_FRAME_SIZE - l, - free_list_index); + n_alloc = vlib_buffer_alloc (vm, im->empty_buffers[cpu_index] + l, + 2 * VLIB_FRAME_SIZE - l); _vec_len (im->empty_buffers[cpu_index]) = l + n_alloc; } |