David S. Miller 6b0a7f84ea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflict resolution of af_smc.c from Stephen Rothwell.

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

2019-04-17 11:26:25 -07:00

..

associola.c

sctp: add SCTP_FUTURE_ASSOC for SCTP_PEER_ADDR_THLDS sockopt

2019-01-30 00:44:06 -08:00

auth.c

sctp: move up sctp_auth_init_hmacs() in sctp_endpoint_init()

2019-03-08 11:42:49 -08:00

bind_addr.c

sctp: add sock_reuseport for the sock in __sctp_hash_endpoint

2018-11-12 09:09:51 -08:00

chunk.c

sctp: chunk.c: correct format string for size_t in printk

2019-02-28 10:33:40 -08: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

inet_diag: fix reporting cgroup classid and fallback to priority

2019-02-12 13:35:57 -05:00

endpointola.c

sctp: move up sctp_auth_init_hmacs() in sctp_endpoint_init()

2019-03-08 11:42:49 -08:00

input.c

sctp: add sock_reuseport for the sock in __sctp_hash_endpoint

2018-11-12 09:09:51 -08: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: set flow sport from saddr only when it's 0

2019-01-24 18:13:57 -08:00

Kconfig

sctp: whitespace fixes

2018-07-24 14:10:42 -07: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

sctp: call gso_reset_checksum when computing checksum in sctp_gso_segment

2019-02-13 19:31:43 -05:00

output.c

sctp: increase sk_wmem_alloc when head->truesize is increased

2018-11-27 15:42:31 -08:00

outqueue.c

sctp: add SCTP_FUTURE_ASOC and SCTP_CURRENT_ASSOC for SCTP_STREAM_SCHEDULER sockopt

2019-01-30 00:44:08 -08:00

primitive.c

sctp: rename enum sctp_event to sctp_event_type

2018-11-19 12:25:43 -08:00

proc.c

sctp: remove useless start_fail from sctp_ht_iter in proc

2018-08-27 15:13:17 -07:00

protocol.c

sctp: initialize _pad of sockaddr_in before copying to user memory

2019-04-01 18:08:19 -07:00

sm_make_chunk.c

sctp: set chunk transport correctly when it's a new asoc

2019-01-24 18:13:57 -08:00

sm_sideeffect.c

sctp: rename enum sctp_event to sctp_event_type

2018-11-19 12:25:43 -08:00

sm_statefuns.c

sctp: implement memory accounting on rx path

2019-04-15 13:36:51 -07:00

sm_statetable.c

sctp: rename enum sctp_event to sctp_event_type

2018-11-19 12:25:43 -08:00

socket.c

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

2019-04-17 11:26:25 -07:00

stream_interleave.c

sctp: Pass sk_buff_head explicitly to sctp_ulpq_tail_event().

2019-04-11 21:33:31 -07:00

stream_sched_prio.c

net/sctp: Make wrappers for accessing in/out streams

2018-08-11 12:25:15 -07:00

stream_sched_rr.c

net/sctp: Make wrappers for accessing in/out streams

2018-08-11 12:25:15 -07:00

stream_sched.c

net/sctp: Make wrappers for accessing in/out streams

2018-08-11 12:25:15 -07:00

stream.c

sctp: convert to genradix

2019-03-12 10:04:02 -07:00

sysctl.c

sctp: support sysctl to allow users to use stream interleave

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

transport.c

sctp: don't compare hb_timer expire date before starting it

2019-02-22 11:11:54 -08:00

tsnmap.c

sctp: Fix FSF address in file headers

2013-12-06 12:37:56 -05:00

ulpevent.c

sctp: implement memory accounting on rx path

2019-04-15 13:36:51 -07:00

ulpqueue.c

sctp: implement memory accounting on rx path

2019-04-15 13:36:51 -07:00