Skip to content

Commit

Permalink
fixing merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@abpoth
abpoth committed Aug 28, 2023
1 parent c2aea76 commit d942223
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion third_party/openthread/repo
Submodule repo updated 58 files
+14 −14 .github/workflows/build.yml
+1 −1 .github/workflows/codeql.yml
+1 −1 .github/workflows/docker.yml
+1 −1 .github/workflows/fuzz.yml
+1 −1 .github/workflows/makefile-check.yml
+1 −1 .github/workflows/otci.yml
+3 −3 .github/workflows/otns.yml
+7 −7 .github/workflows/posix.yml
+9 −9 .github/workflows/simulation-1.1.yml
+7 −7 .github/workflows/simulation-1.2.yml
+1 −1 .github/workflows/size.yml
+5 −5 .github/workflows/toranj.yml
+4 −4 .github/workflows/unit.yml
+1 −1 .github/workflows/version.yml
+100 −0 examples/config/ot-core-config-check-size-br.h
+95 −0 examples/config/ot-core-config-check-size-ftd.h
+95 −0 examples/config/ot-core-config-check-size-mtd.h
+12 −12 include/openthread/dataset.h
+1 −1 include/openthread/instance.h
+3 −0 include/openthread/radio_stats.h
+10 −5 include/openthread/tcp.h
+3 −3 include/openthread/thread_ftd.h
+1 −1 script/check-arm-build
+138 −108 script/check-size
+1 −1 script/test
+3 −2 src/cli/README_TCP.md
+160 −1 src/cli/cli.cpp
+544 −736 src/cli/cli_dataset.cpp
+47 −1 src/cli/cli_dataset.hpp
+4 −4 src/cli/cli_history.cpp
+94 −39 src/cli/cli_tcp.cpp
+3 −1 src/cli/cli_tcp.hpp
+13 −0 src/core/border_router/infra_if.cpp
+12 −0 src/core/config/border_routing.h
+12 −0 src/core/config/dns_dso.h
+12 −0 src/core/config/dnssd_server.h
+1 −0 src/core/mac/mac.cpp
+31 −2 src/core/net/dns_dso.cpp
+14 −0 src/core/net/dnssd_server.cpp
+2 −2 src/core/net/nat64_translator.cpp
+54 −14 src/core/net/tcp6.cpp
+1 −1 src/core/thread/indirect_sender.cpp
+30 −10 src/core/thread/mesh_forwarder.cpp
+21 −25 src/core/thread/mesh_forwarder.hpp
+112 −0 tests/scripts/expect/cli-tcp-tfo-tls.exp
+103 −0 tests/scripts/expect/cli-tcp-tfo.exp
+0 −0 tests/scripts/expect/cli-tcp-tls.exp
+1 −0 third_party/tcplp/CMakeLists.txt
+5 −0 third_party/tcplp/bsdtcp/tcp.h
+9 −1 third_party/tcplp/bsdtcp/tcp_const.h
+1,295 −0 third_party/tcplp/bsdtcp/tcp_fastopen.c
+111 −0 third_party/tcplp/bsdtcp/tcp_fastopen.h
+183 −10 third_party/tcplp/bsdtcp/tcp_input.c
+112 −3 third_party/tcplp/bsdtcp/tcp_output.c
+11 −1 third_party/tcplp/bsdtcp/tcp_subr.c
+28 −9 third_party/tcplp/bsdtcp/tcp_usrreq.c
+22 −2 third_party/tcplp/bsdtcp/tcp_var.h
+6 −5 third_party/tcplp/tcplp.h

0 comments on commit d942223

Please sign in to comment.