David S. Miller 1602f49b58 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts were two cases of simple overlapping changes,
nothing serious.

In the UDP case, we need to add a hlist_add_tail_rcu()
to linux/rculist.h, because we've moved UDP socket handling
away from using nulls lists.

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

2016-04-23 18:51:33 -04:00

..

associola.c

sctp: align MTU to a word

2016-03-20 16:31:12 -04:00

auth.c

sctp: Use shash

2016-01-27 20:36:15 +08:00

bind_addr.c

sctp: fix copying more bytes than expected in sctp_add_bind_addr

2016-03-08 15:04:08 -05:00

chunk.c

sctp: allow sctp_transmit_packet and others to use gfp

2016-03-13 22:29:07 -04:00

debug.c

sctp: Fix FSF address in file headers

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

endpointola.c

sctp: Use shash

2016-01-27 20:36:15 +08:00

input.c

sctp: align MTU to a word

2016-03-20 16:31:12 -04:00

inqueue.c

sctp: add support for RPS and RFS

2016-04-14 21:40:24 -04:00

ipv6.c

sctp: lack the check for ports in sctp_v6_cmp_addr

2016-03-01 17:25:12 -05:00

Kconfig

sctp: add the sctp_diag.c file

2016-04-15 17:29:36 -04:00

Makefile

sctp: add the sctp_diag.c file

2016-04-15 17:29:36 -04:00

objcnt.c

sctp: fix checkpatch errors with (foo*)|foo * bar|foo* bar

2013-12-26 13:47:47 -05:00

output.c

sctp: flush if we can't fit another DATA chunk

2016-04-05 15:39:44 -04:00

outqueue.c

sctp: avoid refreshing heartbeat timer too often

2016-04-10 22:22:34 -04:00

primitive.c

sctp: Fix FSF address in file headers

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

probe.c

net: sctp: Convert log timestamps to be y2038 safe

2016-03-01 17:18:44 -05:00

proc.c

sctp: fix some rhashtable functions using in sctp proc/diag

2016-04-15 17:29:37 -04:00

protocol.c

sctp: fix copying more bytes than expected in sctp_add_bind_addr

2016-03-08 15:04:08 -05:00

sctp_diag.c

net: use jiffies_to_msecs to replace EXPIRES_IN_MS in inet/sctp_diag

2016-04-21 13:55:33 -04:00

sm_make_chunk.c

sctp: avoid refreshing heartbeat timer too often

2016-04-10 22:22:34 -04:00

sm_sideeffect.c

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

2016-04-23 18:51:33 -04:00

sm_statefuns.c

sctp: fix use-after-free in pr_debug statement

2016-01-11 17:13:01 -05:00

sm_statetable.c

sctp: fix checkpatch errors with indent

2013-12-26 13:47:48 -05:00

socket.c

sctp: fix some rhashtable functions using in sctp proc/diag

2016-04-15 17:29:37 -04:00

ssnmap.c

sctp: Fix FSF address in file headers

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

sysctl.c

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

2016-01-11 23:55:43 -05:00

transport.c

sctp: avoid refreshing heartbeat timer too often

2016-04-10 22:22:34 -04:00

tsnmap.c

sctp: Fix FSF address in file headers

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

ulpevent.c

sctp: Fixup v4mapped behaviour to comply with Sock API

2014-07-31 21:49:06 -07:00

ulpqueue.c

sctp: simplify sk_receive_queue locking

2016-04-15 17:22:20 -04:00