On Thu, Apr 11, 2024 at 12:07:10PM +0200, Matthieu Baerts (NGI0) wrote: > From: Geliang Tang <tanggeliang@xxxxxxxxxx> > > commit e7c42bf4d320affe37337aa83ae0347832b3f568 upstream. > > This patch uses addition assignment operator (+=) to append strings > instead of duplicating the variable name in mptcp_connect.sh and > mptcp_join.sh. > > This can make the statements shorter. > > Note: in mptcp_connect.sh, add a local variable extra in do_transfer to > save the various extra warning logs, using += to append it. And add a > new variable tc_info to save various tc info, also using += to append it. > This can make the code more readable and prepare for the next commit. > > Signed-off-by: Geliang Tang <tanggeliang@xxxxxxxxxx> > Reviewed-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx> > Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx> > Link: https://lore.kernel.org/r/20240308-upstream-net-next-20240308-selftests-mptcp-unification-v1-8-4f42c347b653@xxxxxxxxxx > Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx> > [ Conflicts in mptcp_connect.sh: this commit was supposed to be > backported before commit 7a1b3490f47e ("mptcp: don't account accept() > of non-MPC client as fallback to TCP"). The new condition added by > this commit was then not expected, and was in fact at the wrong place > in v6.6: in case of issue, the problem would not have been reported > correctly. ] > Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx> > --- > .../selftests/net/mptcp/mptcp_connect.sh | 53 ++++++++++--------- > .../testing/selftests/net/mptcp/mptcp_join.sh | 30 +++++------ > 2 files changed, 43 insertions(+), 40 deletions(-) Now queued up, thanks. greg k-h