David S. Miller aa11d958d1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	arch/microblaze/include/asm/socket.h

2009-08-12 17:44:53 -07:00

..

ccids

net: mark read-only arrays as const

2009-08-05 10:42:58 -07:00

ackvec.c

dccp: Set per-connection CCIDs via socket options

2008-11-23 16:02:31 -08:00

ackvec.h

dccp: Minimise header option overhead in setting the MPS

2009-03-02 03:07:23 -08:00

ccid.c

dccp: Integrate the TFRC library with DCCP

2009-01-04 21:45:33 -08:00

ccid.h

dccp: Clean up ccid.c after integration of CCID plugins

2009-01-04 21:43:23 -08:00

dccp.h

dccp: Do not let initial option overhead shrink the MPS

2009-03-02 03:07:23 -08:00

diag.c

dccp_diag: LISTEN sockets don't have CCIDs

2008-12-17 16:08:01 -08:00

feat.c

net: mark read-only arrays as const

2009-08-05 10:42:58 -07:00

feat.h

dccp: Debugging functions for feature negotiation

2009-01-21 14:34:05 -08:00

input.c

dccp: Integrate the TFRC library with DCCP

2009-01-04 21:45:33 -08:00

ipv4.c

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

ipv6.c

ipv6: Use correct data types for ICMPv6 type and code

2009-06-23 04:31:07 -07:00

ipv6.h

…

Kconfig

dccp: Lockless integration of CCID congestion-control plugins

2009-01-04 21:42:53 -08:00

Makefile

dccp: Integrate the TFRC library with DCCP

2009-01-04 21:45:33 -08:00

minisocks.c

dccp: Implement both feature-local and feature-remote Sequence Window feature

2009-01-21 14:34:04 -08:00

options.c

dccp: Debugging functions for feature negotiation

2009-01-21 14:34:05 -08:00

output.c

net: adding memory barrier to the poll and receive callbacks

2009-07-09 17:06:57 -07:00

probe.c

dccp: API to query the current TX/RX CCID

2008-11-23 16:04:59 -08:00

proto.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-08-12 17:44:53 -07:00

sysctl.c

dccp: Initialisation and type-checking of feature sysctls

2009-01-21 14:34:05 -08:00

timer.c

dccp: Limit feature negotiation to connection setup phase

2008-11-12 00:42:58 -08:00