From b9e869f6f0b2cf6508949f4c1adb54a4078676df Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@mandriva.com>
Date: Mon, 20 Mar 2006 19:24:41 -0800
Subject: [PATCH] --- yaml --- r: 22205 b: refs/heads/master c:
 04e2661e9c00386412b64612549cf24c8baef67c h: refs/heads/master i:   22203:
 e0d8b30aad4c33a37b4667c1acc03cd31ef55747 v: v3

---
 [refs]                | 2 +-
 trunk/net/dccp/ipv4.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 6c6bf4bb48eb..e07c180088f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 057fc6755a2381b4e81636659ef519e069f38623
+refs/heads/master: 04e2661e9c00386412b64612549cf24c8baef67c
diff --git a/trunk/net/dccp/ipv4.c b/trunk/net/dccp/ipv4.c
index be5ce57b8046..f94286e46c42 100644
--- a/trunk/net/dccp/ipv4.c
+++ b/trunk/net/dccp/ipv4.c
@@ -1051,7 +1051,10 @@ int dccp_v4_init_sock(struct sock *sk)
 	 * setsockopt(CCIDs-I-want/accept). -acme
 	 */
 	if (likely(!dccp_ctl_socket_init)) {
-		int rc;
+		int rc = dccp_feat_init(sk);
+
+		if (rc)
+			return rc;
 
 		if (dp->dccps_options.dccpo_send_ack_vector) {
 			dp->dccps_hc_rx_ackvec = dccp_ackvec_alloc(GFP_KERNEL);
@@ -1075,10 +1078,6 @@ int dccp_v4_init_sock(struct sock *sk)
 			dp->dccps_hc_rx_ccid = dp->dccps_hc_tx_ccid = NULL;
 			return -ENOMEM;
 		}
-
-		rc = dccp_feat_init(sk);
-		if (rc)
-			return rc;
 	} else {
 		/* control socket doesn't need feat nego */
 		INIT_LIST_HEAD(&dp->dccps_options.dccpo_pending);