From 3e2e1907d485ed321f99350dd46e6822db6ac4d4 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Thu, 14 Mar 2019 09:21:02 -0700 Subject: ADJ: more thorough link up check Change-Id: I04dbfb914706b25fcc3bd6ee0d19cfdc810234ae Signed-off-by: Neale Ranns --- src/vnet/interface_funcs.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'src/vnet/interface_funcs.h') diff --git a/src/vnet/interface_funcs.h b/src/vnet/interface_funcs.h index ef1fc16eded..b862f48ef36 100644 --- a/src/vnet/interface_funcs.h +++ b/src/vnet/interface_funcs.h @@ -306,8 +306,23 @@ vnet_sw_interface_get_mtu (vnet_main_t * vnm, u32 sw_if_index, vnet_mtu_t af) always_inline uword vnet_hw_interface_is_link_up (vnet_main_t * vnm, u32 hw_if_index) { - return (vnet_hw_interface_get_flags (vnm, hw_if_index) & - VNET_HW_INTERFACE_FLAG_LINK_UP) != 0; + return ((vnet_hw_interface_get_flags (vnm, hw_if_index) & + VNET_HW_INTERFACE_FLAG_LINK_UP) != 0); +} + +always_inline uword +vnet_sw_interface_is_link_up (vnet_main_t * vnm, u32 sw_if_index) +{ + vnet_sw_interface_t *sw = vnet_get_sup_sw_interface (vnm, sw_if_index); + + return (vnet_hw_interface_is_link_up (vnm, sw->hw_if_index)); +} + +always_inline uword +vnet_sw_interface_is_up (vnet_main_t * vnm, u32 sw_if_index) +{ + return (vnet_sw_interface_is_admin_up (vnm, sw_if_index) && + vnet_sw_interface_is_link_up (vnm, sw_if_index)); } always_inline vlib_frame_t * -- cgit 1.2.3-korg