| Message ID | 20210701113311.62070-3-po-hsu.lin@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [F-oem-5.10/F-oem-5.13,G/H/I/Unstable,SRU,1/1] Revert "UBUNTU: SAUCE: selftests/net -- disable l2tp.sh test" | expand |
On 01.07.21 13:33, Po-Hsu Lin wrote: > BugLink: https://bugs.launchpad.net/bugs/1934293 > > This reverts commit 2d3d312006346deca22a6c4689e2afe3d5742b32. > > With commit 27d53323664c54 "l2tp: remove skb_dst_set() from > l2tp_xmit_skb()" landed in our kernel and l2tp.sh test re-enabled in > our test suite [1], we can now revert this SAUCE patch to get l2tp.sh > tested. > > [1] https://kernel.ubuntu.com/git/ubuntu/autotest-client-tests.git/commit/?id=7dea7776ce431e5a1c550dc73b1d9ac0ba49698d > > Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com> > --- Applied to impish:linux/master-next. It was too late for this cycle but maybe if anything comes up. -Stefan > tools/testing/selftests/net/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile > index 623f3fb..7f5659f 100644 > --- a/tools/testing/selftests/net/Makefile > +++ b/tools/testing/selftests/net/Makefile > @@ -10,7 +10,7 @@ TEST_PROGS += fib_tests.sh fib-onlink-tests.sh pmtu.sh udpgso.sh ip_defrag.sh > TEST_PROGS += udpgso_bench.sh fib_rule_tests.sh msg_zerocopy.sh psock_snd.sh > TEST_PROGS += udpgro_bench.sh udpgro.sh test_vxlan_under_vrf.sh reuseport_addr_any.sh > TEST_PROGS += test_vxlan_fdb_changelink.sh so_txtime.sh ipv6_flowlabel.sh > -TEST_PROGS += tcp_fastopen_backup_key.sh fcnal-test.sh traceroute.sh > +TEST_PROGS += tcp_fastopen_backup_key.sh fcnal-test.sh l2tp.sh traceroute.sh > TEST_PROGS += fin_ack_lat.sh fib_nexthop_multiprefix.sh fib_nexthops.sh > TEST_PROGS += altnames.sh icmp_redirect.sh ip6_gre_headroom.sh > TEST_PROGS += route_localnet.sh >
diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile index 623f3fb..7f5659f 100644 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -10,7 +10,7 @@ TEST_PROGS += fib_tests.sh fib-onlink-tests.sh pmtu.sh udpgso.sh ip_defrag.sh TEST_PROGS += udpgso_bench.sh fib_rule_tests.sh msg_zerocopy.sh psock_snd.sh TEST_PROGS += udpgro_bench.sh udpgro.sh test_vxlan_under_vrf.sh reuseport_addr_any.sh TEST_PROGS += test_vxlan_fdb_changelink.sh so_txtime.sh ipv6_flowlabel.sh -TEST_PROGS += tcp_fastopen_backup_key.sh fcnal-test.sh traceroute.sh +TEST_PROGS += tcp_fastopen_backup_key.sh fcnal-test.sh l2tp.sh traceroute.sh TEST_PROGS += fin_ack_lat.sh fib_nexthop_multiprefix.sh fib_nexthops.sh TEST_PROGS += altnames.sh icmp_redirect.sh ip6_gre_headroom.sh TEST_PROGS += route_localnet.sh
BugLink: https://bugs.launchpad.net/bugs/1934293 This reverts commit 2d3d312006346deca22a6c4689e2afe3d5742b32. With commit 27d53323664c54 "l2tp: remove skb_dst_set() from l2tp_xmit_skb()" landed in our kernel and l2tp.sh test re-enabled in our test suite [1], we can now revert this SAUCE patch to get l2tp.sh tested. [1] https://kernel.ubuntu.com/git/ubuntu/autotest-client-tests.git/commit/?id=7dea7776ce431e5a1c550dc73b1d9ac0ba49698d Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com> --- tools/testing/selftests/net/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)