diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2021-02-16 22:58:44 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-02-16 23:12:23 -0800 |
| commit | b646acd5eb48ec49ef90404336d7e8ee502ecd05 (patch) | |
| tree | cf6859bd3c44bc865f3248810d66a165bd757f8f /tools | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | wireguard-linux-b646acd5eb48ec49ef90404336d7e8ee502ecd05.tar.xz wireguard-linux-b646acd5eb48ec49ef90404336d7e8ee502ecd05.zip | |
net: re-solve some conflicts after net -> net-next merge
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/testing/selftests/net/forwarding/tc_flower.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/testing/selftests/net/forwarding/tc_flower.sh b/tools/testing/selftests/net/forwarding/tc_flower.sh index 4b58ccae3429..683711f41aa9 100755 --- a/tools/testing/selftests/net/forwarding/tc_flower.sh +++ b/tools/testing/selftests/net/forwarding/tc_flower.sh @@ -3,7 +3,8 @@ ALL_TESTS="match_dst_mac_test match_src_mac_test match_dst_ip_test \ match_src_ip_test match_ip_flags_test match_pcp_test match_vlan_test \ - match_ip_tos_test match_indev_testmatch_ip_ttl_test match_mpls_label_test \ + match_ip_tos_test match_indev_test match_ip_ttl_test + match_mpls_label_test \ match_mpls_tc_test match_mpls_bos_test match_mpls_ttl_test \ match_mpls_lse_test" NUM_NETIFS=2 |