[DCCP]: Don't use necessarily the same CCID for tx and rx

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc include/linux/dccp.h
Simple merge

diff --cc net/dccp/ipv4.c
Simple merge

diff --cc net/dccp/options.c
Simple merge