Remove dummy_interface_tx nodes from l2tp l2xcrw and nsh

Change-Id: I51e0d4a9ec62514a85bbe4c5f56a48d60ab6f4e4
Signed-off-by: John Lo <loj@cisco.com>

diff --git a/src/plugins/nsh/nsh_api.c b/src/plugins/nsh/nsh_api.c
index e541301..02675f9 100644 (file)
--- a/src/plugins/nsh/nsh_api.c
+++ b/src/plugins/nsh/nsh_api.c
@@ -90,14 +90,6 @@ nsh_interface_admin_up_down (vnet_main_t * vnm, u32 nsh_hw_if, u32 flags)
   return 0;
 }
 
-static uword
-dummy_interface_tx (vlib_main_t * vm,
-                   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  clib_warning ("you shouldn't be here, leaking buffers...");
-  return frame->n_vectors;
-}
-
 /**
  * @brief Naming for NSH tunnel
  *
@@ -118,7 +110,6 @@ format_nsh_name (u8 * s, va_list * args)
 VNET_DEVICE_CLASS (nsh_device_class, static) = {
   .name = "NSH",
   .format_device_name = format_nsh_name,
-  .tx_function = dummy_interface_tx,
   .admin_up_down_function = nsh_interface_admin_up_down,
 };
 /* *INDENT-ON* */

diff --git a/src/vnet/l2/l2_xcrw.c b/src/vnet/l2/l2_xcrw.c
index 1280b11..540ce3f 100644 (file)
--- a/src/vnet/l2/l2_xcrw.c
+++ b/src/vnet/l2/l2_xcrw.c
@@ -272,14 +272,6 @@ l2_xcrw_init (vlib_main_t * vm)
 
 VLIB_INIT_FUNCTION (l2_xcrw_init);
 
-static uword
-dummy_interface_tx (vlib_main_t * vm,
-                   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  clib_warning ("you shouldn't be here, leaking buffers...");
-  return frame->n_vectors;
-}
-
 static u8 *
 format_xcrw_name (u8 * s, va_list * args)
 {
@@ -291,7 +283,6 @@ format_xcrw_name (u8 * s, va_list * args)
 VNET_DEVICE_CLASS (xcrw_device_class,static) = {
   .name = "Xcrw",
   .format_device_name = format_xcrw_name,
-  .tx_function = dummy_interface_tx,
 };
 /* *INDENT-ON* */
 

diff --git a/src/vnet/l2tp/l2tp.c b/src/vnet/l2tp/l2tp.c
index 99ae6c4..6758db3 100644 (file)
--- a/src/vnet/l2tp/l2tp.c
+++ b/src/vnet/l2tp/l2tp.c
@@ -254,20 +254,11 @@ l2tpv3_name_renumber (vnet_hw_interface_t * hi, u32 new_dev_instance)
   return 0;
 }
 
-static uword
-dummy_interface_tx (vlib_main_t * vm,
-                   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  clib_warning ("you shouldn't be here, leaking buffers...");
-  return frame->n_vectors;
-}
-
 /* *INDENT-OFF* */
 VNET_DEVICE_CLASS (l2tpv3_device_class,static) = {
   .name = "L2TPv3",
   .format_device_name = format_l2tpv3_name,
   .name_renumber = l2tpv3_name_renumber,
-  .tx_function = dummy_interface_tx,
 };
 /* *INDENT-ON* */