diff options
author | Damjan Marion <damarion@cisco.com> | 2018-04-13 19:43:39 +0200 |
---|---|---|
committer | Damjan Marion <damarion@cisco.com> | 2018-04-13 19:45:57 +0200 |
commit | fe7d4a2e31529eed5416b38b520fdc84687df03c (patch) | |
tree | dd3e603fc305d486840f844d919c87f5d0b4b101 /src/vnet/ip/icmp6.c | |
parent | bca9290056b1ee206a05c13bbb46b1b40a8bd804 (diff) |
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 <damarion@cisco.com>
Diffstat (limited to 'src/vnet/ip/icmp6.c')
-rw-r--r-- | src/vnet/ip/icmp6.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/vnet/ip/icmp6.c b/src/vnet/ip/icmp6.c index 6beec28c2cf..fd5d0ecba38 100644 --- a/src/vnet/ip/icmp6.c +++ b/src/vnet/ip/icmp6.c @@ -526,14 +526,13 @@ ip6_icmp_error (vlib_main_t * vm, b->current_length = 0; } } + p0->current_length = + p0->current_length > 1280 ? 1280 : p0->current_length; + /* Add IP header and ICMPv6 header including a 4 byte data field */ vlib_buffer_advance (p0, -sizeof (ip6_header_t) - sizeof (icmp46_header_t) - 4); - - p0->current_length = - p0->current_length > 1280 ? 1280 : p0->current_length; - out_ip0 = vlib_buffer_get_current (p0); icmp0 = (icmp46_header_t *) & out_ip0[1]; |