From 898273fbb588811824bb27ad0ef203d358a7121a Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Sat, 18 Mar 2017 02:57:38 -0700 Subject: Check change in unnumbered setting before updating IP enabled state Change-Id: I6424a083ec889961ba4d0cd1df8348f20436be14 Signed-off-by: Neale Ranns --- src/vnet/interface_api.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/vnet/interface_api.c') diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c index 44798c8b33b..39c062714bf 100644 --- a/src/vnet/interface_api.c +++ b/src/vnet/interface_api.c @@ -433,6 +433,7 @@ static void vl_api_sw_interface_set_unnumbered_t_handler vnet_main_t *vnm = vnet_get_main (); u32 sw_if_index = ntohl (mp->sw_if_index); u32 unnumbered_sw_if_index = ntohl (mp->unnumbered_sw_if_index); + u32 was_unnum; /* * The API message field names are backwards from @@ -454,6 +455,7 @@ static void vl_api_sw_interface_set_unnumbered_t_handler vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, unnumbered_sw_if_index); + was_unnum = (si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED); if (mp->is_add) { @@ -480,8 +482,12 @@ static void vl_api_sw_interface_set_unnumbered_t_handler ip6_main.lookup_main.if_address_pool_index_by_sw_if_index [unnumbered_sw_if_index] = ~0; } - ip4_sw_interface_enable_disable (unnumbered_sw_if_index, mp->is_add); - ip6_sw_interface_enable_disable (unnumbered_sw_if_index, mp->is_add); + + if (was_unnum != (si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)) + { + ip4_sw_interface_enable_disable (unnumbered_sw_if_index, mp->is_add); + ip6_sw_interface_enable_disable (unnumbered_sw_if_index, mp->is_add); + } done: REPLY_MACRO (VL_API_SW_INTERFACE_SET_UNNUMBERED_REPLY); -- cgit 1.2.3-korg