aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2018-11-26 16:05:07 +0100
committerDamjan Marion <damarion@cisco.com>2018-11-26 16:05:07 +0100
commitddf6e08d2e3fc1614430e26dea632fbc79df2906 (patch)
tree95177379caba6b2a5f6f5a596f2cab5699b12bc2
parent162989e05100ef319dd7b7a7bc1f450368f7b760 (diff)
Remove unused argument from eth_identify_subint(...)
Change-Id: I0e89fbc51f30325655c4e9d0104aceb3ead3b16f Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--src/vnet/ethernet/ethernet.h1
-rwxr-xr-xsrc/vnet/ethernet/node.c5
-rw-r--r--src/vnet/l2/l2_efp_filter.c3
3 files changed, 2 insertions, 7 deletions
diff --git a/src/vnet/ethernet/ethernet.h b/src/vnet/ethernet/ethernet.h
index 7435599c347..ceaadd26c1c 100644
--- a/src/vnet/ethernet/ethernet.h
+++ b/src/vnet/ethernet/ethernet.h
@@ -517,7 +517,6 @@ eth_vlan_table_lookups (ethernet_main_t * em,
// Returns 1 if a matching subinterface was found, otherwise returns 0.
always_inline u32
eth_identify_subint (vnet_hw_interface_t * hi,
- vlib_buffer_t * b0,
u32 match_flags,
main_intf_t * main_intf,
vlan_intf_t * vlan_intf,
diff --git a/src/vnet/ethernet/node.c b/src/vnet/ethernet/node.c
index 6e1e1e3f3c8..7cf78c65435 100755
--- a/src/vnet/ethernet/node.c
+++ b/src/vnet/ethernet/node.c
@@ -208,9 +208,8 @@ identify_subint (vnet_hw_interface_t * hi,
{
u32 matched;
- matched = eth_identify_subint (hi, b0, match_flags,
- main_intf, vlan_intf, qinq_intf,
- new_sw_if_index, error0, is_l2);
+ matched = eth_identify_subint (hi, match_flags, main_intf, vlan_intf,
+ qinq_intf, new_sw_if_index, error0, is_l2);
if (matched)
{
diff --git a/src/vnet/l2/l2_efp_filter.c b/src/vnet/l2/l2_efp_filter.c
index f10c5eaf7f9..69d40a03497 100644
--- a/src/vnet/l2/l2_efp_filter.c
+++ b/src/vnet/l2/l2_efp_filter.c
@@ -301,7 +301,6 @@ l2_efp_filter_node_fn (vlib_main_t * vm,
&main_intf1, &vlan_intf1, &qinq_intf1);
matched0 = eth_identify_subint (hi0,
- b0,
match_flags0,
main_intf0,
vlan_intf0,
@@ -310,7 +309,6 @@ l2_efp_filter_node_fn (vlib_main_t * vm,
&error0, &is_l20);
matched1 = eth_identify_subint (hi1,
- b1,
match_flags1,
main_intf1,
vlan_intf1,
@@ -419,7 +417,6 @@ l2_efp_filter_node_fn (vlib_main_t * vm,
&main_intf0, &vlan_intf0, &qinq_intf0);
matched0 = eth_identify_subint (hi0,
- b0,
match_flags0,
main_intf0,
vlan_intf0,