ethernet: fix DMAC check and skip unnecessary ones (VPP-1868)

[vpp.git] / src / vnet / ip / ip6_forward.c

diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c
index 0a45535..e4d8fc0 100644 (file)
--- a/src/vnet/ip/ip6_forward.c
+++ b/src/vnet/ip/ip6_forward.c
@@ -239,6 +239,8 @@ void
 ip6_sw_interface_enable_disable (u32 sw_if_index, u32 is_enable)
 {
   ip6_main_t *im = &ip6_main;
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
 
   vec_validate_init_empty (im->ip_enabled_by_sw_if_index, sw_if_index, 0);
 
@@ -264,6 +266,11 @@ ip6_sw_interface_enable_disable (u32 sw_if_index, u32 is_enable)
 
   vnet_feature_enable_disable ("ip6-multicast", "ip6-not-enabled",
                               sw_if_index, !is_enable, 0, 0);
+
+  if (is_enable)
+    hi->l3_if_count++;
+  else if (hi->l3_if_count)
+    hi->l3_if_count--;
 }
 
 /* get first interface address */
@@ -428,7 +435,10 @@ ip6_add_del_interface_address (vlib_main_t * vm,
          goto done;
        }
 
-      ip_interface_address_del (lm, if_address_index, addr_fib);
+      error = ip_interface_address_del (lm, vnm, if_address_index, addr_fib,
+                                       address_length, sw_if_index);
+      if (error)
+       goto done;
     }
   else
     {
@@ -1893,8 +1903,9 @@ ip6_rewrite_inline_with_gso (vlib_main_t * vm,
 
              if (PREDICT_FALSE
                  (adj0[0].rewrite_header.flags & VNET_REWRITE_HAS_FEATURES))
-               vnet_feature_arc_start (lm->output_feature_arc_index,
-                                       tx_sw_if_index0, &next0, p0);
+               vnet_feature_arc_start_w_cfg_index
+                 (lm->output_feature_arc_index, tx_sw_if_index0, &next0, p0,
+                  adj0->ia_cfg_index);
            }
          else
            {
@@ -1911,8 +1922,9 @@ ip6_rewrite_inline_with_gso (vlib_main_t * vm,
 
              if (PREDICT_FALSE
                  (adj1[0].rewrite_header.flags & VNET_REWRITE_HAS_FEATURES))
-               vnet_feature_arc_start (lm->output_feature_arc_index,
-                                       tx_sw_if_index1, &next1, p1);
+               vnet_feature_arc_start_w_cfg_index
+                 (lm->output_feature_arc_index, tx_sw_if_index1, &next1, p1,
+                  adj1->ia_cfg_index);
            }
          else
            {
@@ -1929,11 +1941,15 @@ ip6_rewrite_inline_with_gso (vlib_main_t * vm,
              vnet_calc_checksums_inline (vm, p1, 0 /* is_ip4 */ ,
                                          1 /* is_ip6 */ ,
                                          0 /* with gso */ );
-           }
 
-         /* Guess we are only writing on simple Ethernet header. */
-         vnet_rewrite_two_headers (adj0[0], adj1[0],
-                                   ip0, ip1, sizeof (ethernet_header_t));
+             /* Guess we are only writing on ipv6 header. */
+             vnet_rewrite_two_headers (adj0[0], adj1[0],
+                                       ip0, ip1, sizeof (ip6_header_t));
+           }
+         else
+           /* Guess we are only writing on simple Ethernet header. */
+           vnet_rewrite_two_headers (adj0[0], adj1[0],
+                                     ip0, ip1, sizeof (ethernet_header_t));
 
          if (is_midchain)
            {
@@ -2022,10 +2038,14 @@ ip6_rewrite_inline_with_gso (vlib_main_t * vm,
              vnet_calc_checksums_inline (vm, p0, 0 /* is_ip4 */ ,
                                          1 /* is_ip6 */ ,
                                          0 /* with gso */ );
-           }
 
-         /* Guess we are only writing on simple Ethernet header. */
-         vnet_rewrite_one_header (adj0[0], ip0, sizeof (ethernet_header_t));
+             /* Guess we are only writing on ip6 header. */
+             vnet_rewrite_one_header (adj0[0], ip0, sizeof (ip6_header_t));
+           }
+         else
+           /* Guess we are only writing on simple Ethernet header. */
+           vnet_rewrite_one_header (adj0[0], ip0,
+                                    sizeof (ethernet_header_t));
 
          /* Update packet buffer attributes/set output interface. */
          rw_len0 = adj0[0].rewrite_header.data_bytes;
@@ -2065,8 +2085,9 @@ ip6_rewrite_inline_with_gso (vlib_main_t * vm,
 
              if (PREDICT_FALSE
                  (adj0[0].rewrite_header.flags & VNET_REWRITE_HAS_FEATURES))
-               vnet_feature_arc_start (lm->output_feature_arc_index,
-                                       tx_sw_if_index0, &next0, p0);
+               vnet_feature_arc_start_w_cfg_index
+                 (lm->output_feature_arc_index, tx_sw_if_index0, &next0, p0,
+                  adj0->ia_cfg_index);
            }
          else
            {