X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_api.c;h=44798c8b33b3e3896827dcef54f35e4675558309;hb=4b919a56642ccd0a44920feace872aeb5b7a62cf;hp=28b09b55598c1948f76da8ca34cb4b1a5bcc05b8;hpb=c60f557590f79b8817382bdd982825b66c4e0a73;p=vpp.git

diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c
index 28b09b55598..44798c8b33b 100644
--- a/src/vnet/interface_api.c
+++ b/src/vnet/interface_api.c
@@ -459,11 +459,26 @@ static void vl_api_sw_interface_set_unnumbered_t_handler
     {
       si->flags |= VNET_SW_INTERFACE_FLAG_UNNUMBERED;
       si->unnumbered_sw_if_index = sw_if_index;
+
+      ip4_main.lookup_main.if_address_pool_index_by_sw_if_index
+	[unnumbered_sw_if_index] =
+	ip4_main.
+	lookup_main.if_address_pool_index_by_sw_if_index[sw_if_index];
+      ip6_main.
+	lookup_main.if_address_pool_index_by_sw_if_index
+	[unnumbered_sw_if_index] =
+	ip6_main.
+	lookup_main.if_address_pool_index_by_sw_if_index[sw_if_index];
     }
   else
     {
       si->flags &= ~(VNET_SW_INTERFACE_FLAG_UNNUMBERED);
       si->unnumbered_sw_if_index = (u32) ~ 0;
+
+      ip4_main.lookup_main.if_address_pool_index_by_sw_if_index
+	[unnumbered_sw_if_index] = ~0;
+      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);