diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2008-11-05 08:55:49 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-05 08:55:49 +0100 |
| commit | ac75773c2742d82cbcb078708df406e9017224b7 (patch) | |
| tree | 7e7b1aa5131c4a61aabd9d86d7332eca98d66a89 /net/dccp/ipv6.c | |
| parent | dccp: List management for new feature negotiation (diff) | |
| download | linux-ac75773c2742d82cbcb078708df406e9017224b7.tar.xz linux-ac75773c2742d82cbcb078708df406e9017224b7.zip | |
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/ipv6.c')
| -rw-r--r-- | net/dccp/ipv6.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index d4ce1224e008..4e172ccfd76c 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -426,7 +426,8 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb) if (req == NULL) goto drop; - dccp_reqsk_init(req, skb); + if (dccp_reqsk_init(req, dccp_sk(sk), skb)) + goto drop_and_free; dreq = dccp_rsk(req); if (dccp_parse_options(sk, dreq, skb)) |