David S. Miller 5ca114400d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

en_rx_am.c was deleted in 'net-next' but had a bug fixed in it in
'net'.

The esp{4,6}_offload.c conflicts were overlapping changes.
The 'out' label is removed so we just return ERR_PTR(-EINVAL)
directly.

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

2018-01-23 13:51:56 -05:00

..

associola.c

sctp: implement enqueue_event for sctp_stream_interleave

2017-12-11 11:23:05 -05:00

auth.c

sctp: remove the typedef sctp_hmac_algo_param_t

2017-07-16 20:52:14 -07:00

bind_addr.c

sctp: remove the typedef sctp_scope_t

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

chunk.c

sctp: implement enqueue_event for sctp_stream_interleave

2017-12-11 11:23:05 -05:00

debug.c

sctp: add SCTP_CID_RECONF conversion in sctp_cname

2017-12-18 13:21:46 -05:00

endpointola.c

net: tracepoint: using sock_set_state tracepoint to trace SCTP state transition

2017-12-20 14:00:25 -05:00

input.c

sctp: fix the handling of ICMP Frag Needed for too small MTUs

2018-01-08 14:19:13 -05:00

inqueue.c

sctp: remove the typedef sctp_chunkhdr_t

2017-07-01 09:08:41 -07:00

ipv6.c

sctp: avoid compiler warning on implicit fallthru

2018-01-15 13:56:13 -05:00

Kconfig

net: sctp: Remove debug SCTP probe module

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

Makefile

net: sctp: Remove debug SCTP probe module

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

objcnt.c

sctp: remove the typedef sctp_dbg_objcnt_entry_t

2017-08-11 10:02:43 -07:00

offload.c

gso: validate gso_type in GSO handlers

2018-01-22 16:01:30 -05:00

output.c

sctp: implement assign_number for sctp_stream_interleave

2017-12-11 11:23:04 -05:00

outqueue.c

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

2018-01-17 00:10:42 -05:00

primitive.c

sctp: remove the typedef sctp_subtype_t

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

proc.c

net: delete /proc THIS_MODULE references

2018-01-16 15:01:33 -05:00

protocol.c

sctp: remove extern from stream sched

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

sctp_diag.c

sctp: Fix a big endian bug in sctp_diag_dump()

2017-09-26 21:16:29 -07:00

sm_make_chunk.c

sctp: removed unused var from sctp_make_auth

2018-01-15 13:59:42 -05:00

sm_sideeffect.c

net: tracepoint: using sock_set_state tracepoint to trace SCTP state transition

2017-12-20 14:00:25 -05:00

sm_statefuns.c

net: sctp: Add SCTP ACK tracking trace event

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

sm_statetable.c

sctp: implement validate_ftsn for sctp_stream_interleave

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

socket.c

sctp: reset ret in again path in sctp_for_each_transport

2018-01-23 11:22:25 -05:00

stream_interleave.c

sctp: implement handle_ftsn for sctp_stream_interleave

2017-12-15 13:52:22 -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

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

2018-01-09 10:37:00 -05: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 handling of ICMP Frag Needed for too small MTUs

2018-01-08 14:19:13 -05:00

tsnmap.c

sctp: Fix FSF address in file headers

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

ulpevent.c

sctp: implement abort_pd for sctp_stream_interleave

2017-12-11 11:23:05 -05:00

ulpqueue.c

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

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