From: David S. Miller Date: Fri, 4 May 2018 13:58:56 +0000 (-0400) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a7b15ab887e5b8e9803136b5a4a0008d7a3dea86;p=linux.git Merge git://git./linux/kernel/git/davem/net Overlapping changes in selftests Makefile. Signed-off-by: David S. Miller --- a7b15ab887e5b8e9803136b5a4a0008d7a3dea86 diff --cc net/smc/af_smc.c index 823ea33715759,544bab42f925a..95b00e4c3396b --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@@ -293,9 -292,19 +293,20 @@@ static void smc_copy_sock_settings_to_s smc_copy_sock_settings(&smc->sk, smc->clcsock->sk, SK_FLAGS_CLC_TO_SMC); } + /* register a new rmb */ + static int smc_reg_rmb(struct smc_link *link, struct smc_buf_desc *rmb_desc) + { + /* register memory region for new rmb */ + if (smc_wr_reg_send(link, rmb_desc->mr_rx[SMC_SINGLE_LINK])) { + rmb_desc->regerr = 1; + return -EFAULT; + } + return 0; + } + static int smc_clnt_conf_first_link(struct smc_sock *smc) { + struct net *net = sock_net(smc->clcsock->sk); struct smc_link_group *lgr = smc->conn.lgr; struct smc_link *link; int rest; diff --cc tools/testing/selftests/net/Makefile index 0a1821f8dfb18,daf5effec3f07..902820d3e8484 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@@ -5,14 -5,12 +5,15 @@@ CFLAGS = -Wall -Wl,--no-as-needed -O2 CFLAGS += -I../../../../usr/include/ TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh rtnetlink.sh -TEST_PROGS += fib_tests.sh fib-onlink-tests.sh pmtu.sh +TEST_PROGS += fib_tests.sh fib-onlink-tests.sh in_netns.sh pmtu.sh udpgso.sh +TEST_PROGS += udpgso_bench.sh + TEST_GEN_PROGS_EXTENDED := in_netns.sh TEST_GEN_FILES = socket TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy +TEST_GEN_FILES += tcp_mmap tcp_inq TEST_GEN_PROGS = reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa TEST_GEN_PROGS += reuseport_dualstack reuseaddr_conflict +TEST_GEN_PROGS += udpgso udpgso_bench_tx udpgso_bench_rx include ../lib.mk