]> git.openpandora.org Git - pandora-kernel.git/commitdiff
dccp: Integrate the TFRC library with DCCP
authorGerrit Renker <gerrit@erg.abdn.ac.uk>
Mon, 5 Jan 2009 05:45:33 +0000 (21:45 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 5 Jan 2009 05:45:33 +0000 (21:45 -0800)
This patch integrates the TFRC library, which is a dependency of CCID-3 (and
CCID-4), with the new use of CCIDs in the DCCP module.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 files changed:
net/dccp/Makefile
net/dccp/ccid.c
net/dccp/ccids/Kconfig
net/dccp/ccids/Makefile [deleted file]
net/dccp/ccids/lib/Makefile [deleted file]
net/dccp/ccids/lib/loss_interval.c
net/dccp/ccids/lib/packet_history.c
net/dccp/ccids/lib/tfrc.c
net/dccp/ccids/lib/tfrc.h
net/dccp/ccids/lib/tfrc_equation.c
net/dccp/feat.c
net/dccp/input.c

Simple merge
diff --cc net/dccp/ccid.c
Simple merge
Simple merge
diff --cc net/dccp/ccids/Makefile
Simple merge
diff --cc net/dccp/ccids/lib/Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/dccp/feat.c
Simple merge
Simple merge