David S. Miller d247b6ab3c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/Makefile net/ipv6/sysctl_net_ipv6.c Two ipv6_table_template[] additions overlap, so the index of the ipv6_table[x] assignments needed to be adjusted. In the drivers/net/Makefile case, we've gotten rid of the garbage whereby we had to list every single USB networking driver in the top-level Makefile, there is just one "USB_NETWORKING" that guards everything. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-08-05 18:46:26 -07:00
..
associola.c	net: sctp: inherit auth_capable on INIT collisions	2014-07-22 19:56:58 -07:00
auth.c	net: sctp: cache auth_enable per endpoint	2014-04-18 18:32:00 -04:00
bind_addr.c
chunk.c	sctp: fix checkpatch errors with space required or prohibited	2013-12-26 13:47:47 -05:00
debug.c
endpointola.c	net: sctp: migrate most recently used transport to ktime	2014-06-11 12:23:17 -07:00
input.c	net: fix the counter ICMP_MIB_INERRORS/ICMP6_MIB_INERRORS	2014-07-31 22:04:18 -07:00
inqueue.c
ipv6.c	sctp: Fixup v4mapped behaviour to comply with Sock API	2014-07-31 21:49:06 -07:00
Kconfig
Makefile	net: sctp: Inline the functions from command.c	2014-07-08 14:38:48 -07:00
objcnt.c	sctp: fix checkpatch errors with (foo*)|foo * bar|foo* bar	2013-12-26 13:47:47 -05:00
output.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-08-05 18:46:26 -07:00
outqueue.c	net: sctp: Rename SCTP_XMIT_NAGLE_DELAY to SCTP_XMIT_DELAY	2014-07-22 13:32:11 -07:00
primitive.c
probe.c	sctp: loading sctp when load sctp_probe	2013-12-16 20:04:27 -05:00
proc.c	snmp: fix some left over of snmp stats	2014-05-14 15:33:47 -04:00
protocol.c	sctp: Fixup v4mapped behaviour to comply with Sock API	2014-07-31 21:49:06 -07:00
sm_make_chunk.c	ktime: add ktime_after and ktime_before helper	2014-06-11 12:23:17 -07:00
sm_sideeffect.c	net: sctp: Don't transition to PF state when transport has exhausted 'Path.Max.Retrans'.	2014-04-27 23:41:14 -04:00
sm_statefuns.c	net: sctp: remove unnecessary break after return/goto	2014-07-15 16:27:01 -07:00
sm_statetable.c	sctp: fix checkpatch errors with indent	2013-12-26 13:47:48 -05:00
socket.c	sctp: Fixup v4mapped behaviour to comply with Sock API	2014-07-31 21:49:06 -07:00
ssnmap.c
sysctl.c	net: sctp: only warn in proc_sctp_do_alpha_beta if write	2014-07-02 18:44:07 -07:00
transport.c	sctp: Fixup v4mapped behaviour to comply with Sock API	2014-07-31 21:49:06 -07:00
tsnmap.c
ulpevent.c	sctp: Fixup v4mapped behaviour to comply with Sock API	2014-07-31 21:49:06 -07:00
ulpqueue.c	sctp: add support for busy polling to sctp protocol	2014-04-20 18:18:55 -04:00