aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/input.c
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2008-11-05 02:55:49 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-05 02:55:49 -0500
commitac75773c2742d82cbcb078708df406e9017224b7 (patch)
tree7e7b1aa5131c4a61aabd9d86d7332eca98d66a89 /net/dccp/input.c
parent61e6473efbd6087e1db3aaa93a5266c5bfd8aa99 (diff)
dccp: Per-socket initialisation of feature negotiation
This provides feature-negotiation initialisation for both DCCP sockets and DCCP request_sockets, to support feature negotiation during connection setup. It also resolves a FIXME regarding the congestion control initialisation. Thanks to Wei Yongjun for help with the IPv6 side of this patch. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/input.c')
-rw-r--r--net/dccp/input.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/dccp/input.c b/net/dccp/input.c
index 779d0ed9ae94..3070015edc75 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -590,8 +590,6 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
590 if (inet_csk(sk)->icsk_af_ops->conn_request(sk, 590 if (inet_csk(sk)->icsk_af_ops->conn_request(sk,
591 skb) < 0) 591 skb) < 0)
592 return 1; 592 return 1;
593
594 /* FIXME: do congestion control initialization */
595 goto discard; 593 goto discard;
596 } 594 }
597 if (dh->dccph_type == DCCP_PKT_RESET) 595 if (dh->dccph_type == DCCP_PKT_RESET)