David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ...

All conflicts were trivial overlapping changes, so reasonably
easy to resolve.

Signed-off-by: David S. Miller <davem@davemloft.net>

2018-07-20 21:17:12 -07:00

..

associola.c

sctp: add support for setting flowlabel when adding a transport

2018-07-04 11:36:54 +09:00

auth.c

treewide: kzalloc() -> kcalloc()

2018-06-12 16:19:22 -07:00

bind_addr.c

sctp: remove the typedef sctp_scope_t

2017-08-06 21:33:41 -07:00

chunk.c

sctp: fix erroneous inc of snmp SctpFragUsrMsgs

2018-06-21 12:49:33 +09:00

debug.c

sctp: add SCTP_CID_I_DATA and SCTP_CID_I_FWD_TSN conversion in sctp_cname

2018-02-12 11:40:01 -05:00

diag.c

sctp: add file comments in diag.c

2018-02-13 13:56:31 -05:00

endpointola.c

treewide: Use struct_size() for kmalloc()-family

2018-06-06 11:15:43 -07:00

input.c

rhashtable: split rhashtable.h

2018-06-22 13:43:27 +09:00

inqueue.c

sctp: fix the issue that the cookie-ack with auth can't get processed

2018-05-02 11:15:33 -04:00

ipv6.c

sctp: check for ipv6_pinfo legal sndflow with flowlabel in sctp_v6_get_dst

2018-07-04 11:36:54 +09:00

Kconfig

net: sctp: Remove debug SCTP probe module

2018-01-02 14:27:29 -05:00

Makefile

sctp: rename sctp_diag.c as diag.c

2018-02-13 13:56:31 -05:00

objcnt.c

proc: introduce proc_create_seq{,_data}

2018-05-16 07:23:35 +02:00

offload.c

net: use skb_is_gso_sctp() instead of open-coding

2018-03-09 11:41:47 -05:00

output.c

sctp: define sctp_packet_gso_append to build GSO frames

2018-06-14 10:25:53 -07:00

outqueue.c

sctp: checkpatch fixups

2018-05-14 23:15:27 -04:00

primitive.c

sctp: remove the typedef sctp_subtype_t

2017-08-06 21:33:42 -07:00

proc.c

proc: introduce proc_create_net_single

2018-05-16 07:24:30 +02:00

protocol.c

sctp: add support for dscp and flowlabel per transport

2018-07-04 11:36:54 +09:00

sm_make_chunk.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2018-05-11 20:53:22 -04:00

sm_sideeffect.c

sctp: add SCTP_AUTH_NO_AUTH type for AUTHENTICATION_EVENT

2018-03-14 13:48:27 -04:00

sm_statefuns.c

sctp: delay the authentication for the duplicated cookie-echo chunk

2018-05-07 23:39:10 -04:00

sm_statetable.c

sctp: implement validate_ftsn for sctp_stream_interleave

2017-12-15 13:52:22 -05:00

socket.c

sctp: add support for setting flowlabel when adding a transport

2018-07-04 11:36:54 +09:00

stream_interleave.c

sctp: remove the left unnecessary check for chunk in sctp_renege_events

2018-02-16 16:32:37 -05:00

stream_sched_prio.c

sctp: remove extern from stream sched

2017-11-28 11:00:13 -05:00

stream_sched_rr.c

sctp: remove extern from stream sched

2017-11-28 11:00:13 -05:00

stream_sched.c

sctp: add stream interleave support in stream scheduler

2017-12-15 13:52:22 -05:00

stream.c

sctp: clear the new asoc's stream outcnt in sctp_stream_update

2018-04-27 13:34:34 -04:00

sysctl.c

sctp: support sysctl to allow users to use stream interleave

2017-12-15 13:52:22 -05:00

transport.c

sctp: fix the issue that pathmtu may be set lower than MINSEGMENT

2018-07-04 21:36:34 +09:00

tsnmap.c

…

ulpevent.c

sctp: remove sctp_chunk_put from fail_mark err path in sctp_ulpevent_make_rcvmsg

2018-05-10 17:48:36 -04:00

ulpqueue.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-12-22 11:16:31 -05:00