Commit ef7f6b16 authored by Amit Cohen's avatar Amit Cohen Committed by David S. Miller
Browse files

selftests: devlink: Make devlink_trap_cleanup() more generic 



Add proto parameter in order to enable the use of devlink_trap_cleanup()
in tests that use IPv6 protocol.

Signed-off-by: default avatarAmit Cohen <amitc@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b45fe95

tools/testing/selftests/drivers/net/mlxsw/devlink_trap_l2_drops.sh

+7 −7
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ source_mac_is_multicast_test() 


	log_test "Source MAC is multicast"



	devlink_trap_drop_cleanup $mz_pid $swp2

	devlink_trap_drop_cleanup $mz_pid $swp2 ip

}



__vlan_tag_mismatch_test()
@@ -148,7 +148,7 @@ __vlan_tag_mismatch_test() 


	devlink_trap_action_set $trap_name "drop"



	devlink_trap_drop_cleanup $mz_pid $swp2

	devlink_trap_drop_cleanup $mz_pid $swp2 ip

}



vlan_tag_mismatch_untagged_test()
@@ -212,7 +212,7 @@ ingress_vlan_filter_test() 


	log_test "Ingress VLAN filter"



	devlink_trap_drop_cleanup $mz_pid $swp2

	devlink_trap_drop_cleanup $mz_pid $swp2 ip



	bridge vlan del vid $vid dev $swp1 master

	bridge vlan del vid $vid dev $swp2 master
@@ -254,7 +254,7 @@ __ingress_stp_filter_test() 


	devlink_trap_action_set $trap_name "drop"



	devlink_trap_drop_cleanup $mz_pid $swp2

	devlink_trap_drop_cleanup $mz_pid $swp2 ip



	bridge vlan del vid $vid dev $swp1 master

	bridge vlan del vid $vid dev $swp2 master
@@ -326,7 +326,7 @@ port_list_is_empty_uc_test() 


	log_test "Port list is empty - unicast"



	devlink_trap_drop_cleanup $mz_pid $swp2

	devlink_trap_drop_cleanup $mz_pid $swp2 ip



	ip link set dev $swp1 type bridge_slave flood on

}
@@ -372,7 +372,7 @@ port_list_is_empty_mc_test() 


	log_test "Port list is empty - multicast"



	devlink_trap_drop_cleanup $mz_pid $swp2

	devlink_trap_drop_cleanup $mz_pid $swp2 ip



	ip link set dev $swp1 type bridge_slave mcast_flood on

}
@@ -419,7 +419,7 @@ port_loopback_filter_uc_test() 


	log_test "Port loopback filter - unicast"



	devlink_trap_drop_cleanup $mz_pid $swp2

	devlink_trap_drop_cleanup $mz_pid $swp2 ip

}



port_loopback_filter_test()

tools/testing/selftests/net/forwarding/devlink_lib.sh

+2 −1
Original line number Diff line number Diff line
@@ -393,7 +393,8 @@ devlink_trap_drop_cleanup() 
{

	local mz_pid=$1; shift

	local dev=$1; shift

	local proto=$1; shift



	kill $mz_pid && wait $mz_pid &> /dev/null

	tc filter del dev $dev egress protocol ip pref 1 handle 101 flower

	tc filter del dev $dev egress protocol $proto pref 1 handle 101 flower

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE