From fe7d4a2e31529eed5416b38b520fdc84687df03c Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Fri, 13 Apr 2018 19:43:39 +0200 Subject: Revert "MTU: Setting of MTU on software interface (instead of hardware interface)" This reverts commit 70083ee74c3141bbefb185525315f1b34497dcaa. Reverting as this patch is causing following crash: 0: /home/damarion/cisco/vpp3/build-data/../src/vnet/devices/devices.h:131 (vnet_get_device_input_thread_index) assertion `queue_id < vec_len (hw->input_node_thread_index_by_queue)' fails Aborted Change-Id: Ie2a365032110b1f67be7a9d832885b9899813d39 Signed-off-by: Damjan Marion --- src/vnet/ipip/ipip.c | 7 ++++--- src/vnet/ipip/sixrd.c | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/vnet/ipip') diff --git a/src/vnet/ipip/ipip.c b/src/vnet/ipip/ipip.c index 9b808d4ac0f..82c961cdddd 100644 --- a/src/vnet/ipip/ipip.c +++ b/src/vnet/ipip/ipip.c @@ -476,16 +476,17 @@ ipip_add_tunnel (ipip_transport_t transport, { vec_validate (im4->fib_index_by_sw_if_index, sw_if_index); hi->min_packet_bytes = 64 + sizeof (ip4_header_t); - hi->max_packet_bytes = 65536 - sizeof (ip4_header_t); } else { vec_validate (im6->fib_index_by_sw_if_index, sw_if_index); hi->min_packet_bytes = 64 + sizeof (ip6_header_t); - hi->max_packet_bytes = 65536 - sizeof (ip6_header_t); } - vnet_sw_interface_set_mtu (vnm, sw_if_index, hi->max_packet_bytes); + hi->per_packet_overhead_bytes = /* preamble */ 8 + /* inter frame gap */ 12; + + /* Standard default ipip MTU. */ + hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] = 9000; t->tunnel_src = *src; t->tunnel_dst = *dst; diff --git a/src/vnet/ipip/sixrd.c b/src/vnet/ipip/sixrd.c index 998025782fb..cfdd0f87e3a 100644 --- a/src/vnet/ipip/sixrd.c +++ b/src/vnet/ipip/sixrd.c @@ -337,8 +337,7 @@ sixrd_add_tunnel (ip6_address_t * ip6_prefix, u8 ip6_prefix_len, t->dev_instance = t_idx; t->user_instance = t_idx; - /* Set default MTU to 1480 */ - vnet_sw_interface_set_mtu (vnet_get_main (), t->sw_if_index, 1480); + hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] = 1480; ipip_tunnel_db_add (t, &key); -- cgit 1.2.3-korg