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/interface_funcs.h | |
| 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/interface_funcs.h')
| -rw-r--r-- | src/vnet/interface_funcs.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/vnet/interface_funcs.h b/src/vnet/interface_funcs.h index 42b69bdf789..6e188f7f543 100644 --- a/src/vnet/interface_funcs.h +++ b/src/vnet/interface_funcs.h @@ -87,15 +87,6 @@ vnet_get_sup_hw_interface (vnet_main_t * vnm, u32 sw_if_index) return vnet_get_hw_interface (vnm, sw->hw_if_index); } -always_inline vnet_hw_interface_t * -vnet_get_sw_hw_interface (vnet_main_t * vnm, u32 sw_if_index) -{ - vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, sw_if_index); - if (sw->type == VNET_SW_INTERFACE_TYPE_HARDWARE) - return vnet_get_hw_interface (vnm, sw->hw_if_index); - return vnet_get_sup_hw_interface (vnm, sw_if_index); -} - always_inline vnet_hw_interface_class_t * vnet_get_hw_interface_class (vnet_main_t * vnm, u32 hw_class_index) { @@ -228,11 +219,19 @@ vnet_hw_interface_get_flags (vnet_main_t * vnm, u32 hw_if_index) } always_inline uword +vnet_hw_interface_get_mtu (vnet_main_t * vnm, u32 hw_if_index, + vlib_rx_or_tx_t dir) +{ + vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index); + return hw->max_l3_packet_bytes[dir]; +} + +always_inline uword vnet_sw_interface_get_mtu (vnet_main_t * vnm, u32 sw_if_index, vlib_rx_or_tx_t dir) { - vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, sw_if_index); - return (sw->max_l3_packet_bytes[dir]); + vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index); + return (hw->max_l3_packet_bytes[dir]); } always_inline uword @@ -293,8 +292,8 @@ clib_error_t *set_hw_interface_change_rx_mode (vnet_main_t * vnm, vnet_hw_interface_rx_mode mode); -/* Set the MTU on the SW interface */ -int vnet_sw_interface_set_mtu (vnet_main_t * vnm, u32 sw_if_index, u32 mtu); +/* Set the MTU on the HW interface */ +void vnet_hw_interface_set_mtu (vnet_main_t * vnm, u32 hw_if_index, u32 mtu); /* update the unnumbered state of an interface */ void vnet_sw_interface_update_unnumbered (u32 sw_if_index, |