David S. Miller a57066b1a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... The UDP reuseport conflict was a little bit tricky. The net-next code, via bpf-next, extracted the reuseport handling into a helper so that the BPF sk lookup code could invoke it. At the same time, the logic for reuseport handling of unconnected sockets changed via commit efc6b6f6c3 which changed the logic to carry on the reuseport result into the rest of the lookup loop if we do not return immediately. This requires moving the reuseport_has_conns() logic into the callers. While we are here, get rid of inline directives as they do not belong in foo.c files. The other changes were cases of more straightforward overlapping modifications. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-07-25 17:49:04 -07:00
..
associola.c	sctp: Don't advertise IPv4 addresses if ipv6only is set on the socket	2020-06-25 16:11:33 -07:00
auth.c	sctp: use crypto_shash_tfm_digest()	2020-05-08 15:32:15 +10:00
bind_addr.c	sctp: Don't advertise IPv4 addresses if ipv6only is set on the socket	2020-06-25 16:11:33 -07:00
chunk.c	sctp: get netns from asoc and ep base	2019-12-09 20:14:01 -08:00
debug.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
diag.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-03-12 22:34:48 -07:00
endpointola.c	sctp: get netns from asoc and ep base	2019-12-09 20:14:01 -08:00
input.c	sctp: Add missing annotation for sctp_err_finish()	2020-02-24 13:26:48 -08:00
inqueue.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
ipv6.c	net/ipv6: remove compat_ipv6_{get,set}sockopt	2020-07-19 18:16:41 -07:00
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile	sctp: rename sctp_diag.c as diag.c	2018-02-13 13:56:31 -05:00
objcnt.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
offload.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-07 11:00:14 -07:00
output.c	sctp: get netns from asoc and ep base	2019-12-09 20:14:01 -08:00
outqueue.c	sctp: add enabled check for path tracepoint loop.	2019-12-30 20:33:05 -08:00
primitive.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
proc.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
protocol.c	sctp: remove redundant initialization of variable status	2020-07-24 17:10:13 -07:00
sm_make_chunk.c	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2020-06-01 12:00:10 -07:00
sm_sideeffect.c	sctp: Don't add the shutdown timer if its already been added	2020-05-19 15:46:52 -07:00
sm_statefuns.c	sctp: Start shutdown on association restart if in SHUTDOWN-SENT state and socket is closed	2020-05-22 15:47:59 -07:00
sm_statetable.c	sctp: remove net sctp.x_enable working as a global switch	2019-08-19 18:27:29 -07:00
socket.c	sctp: fix slab-out-of-bounds in SCTP_DELAYED_SACK processing	2020-07-24 16:40:36 -07:00
stream_interleave.c	sctp: get netns from asoc and ep base	2019-12-09 20:14:01 -08:00
stream_sched_prio.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
stream_sched_rr.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
stream_sched.c	sctp: rename asoc intl_enable to asoc peer.intl_capable	2019-07-08 20:16:25 -07:00
stream.c	sctp: shrink stream outq when fails to do addstream reconf	2020-07-22 18:00:12 -07:00
sysctl.c	sysctl: pass kernel pointers to ->proc_handler	2020-04-27 02:07:40 -04:00
transport.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-12-31 13:37:13 -08:00
tsnmap.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 104	2019-05-24 17:39:00 +02:00
ulpevent.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00
ulpqueue.c	sctp: get netns from asoc and ep base	2019-12-09 20:14:01 -08:00