From 7ea0f563487f5acd2572fc49f5eec84ecb7ddd37 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Wed, 29 Mar 2006 13:58:25 -0800
Subject: [PATCH] --- yaml --- r: 24957 b: refs/heads/master c:
 68907dad58cd7ef11536e1db6baeb98b20af91b2 h: refs/heads/master i:   24955:
 bb736eb9f72fd274f569d11e76415385050c9247 v: v3

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

diff --git a/[refs] b/[refs]
index d3107fa82265..58423bd4a2e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a57b2ee4506bb8a3d2f7ba2f62ff65ec56ba150
+refs/heads/master: 68907dad58cd7ef11536e1db6baeb98b20af91b2
diff --git a/trunk/net/dccp/feat.c b/trunk/net/dccp/feat.c
index e3dd30d36c8a..b39e2a597889 100644
--- a/trunk/net/dccp/feat.c
+++ b/trunk/net/dccp/feat.c
@@ -204,7 +204,7 @@ static int dccp_feat_reconcile(struct sock *sk, struct dccp_opt_pend *opt,
 	if (rc) {
 		kfree(opt->dccpop_sc->dccpoc_val);
 		kfree(opt->dccpop_sc);
-		opt->dccpop_sc = 0;
+		opt->dccpop_sc = NULL;
 		return rc;
 	}
 
@@ -322,7 +322,7 @@ static void dccp_feat_empty_confirm(struct dccp_minisock *dmsk,
 	opt->dccpop_type = type == DCCPO_CHANGE_L ? DCCPO_CONFIRM_R :
 						    DCCPO_CONFIRM_L;
 	opt->dccpop_feat = feature;
-	opt->dccpop_val	 = 0;
+	opt->dccpop_val	 = NULL;
 	opt->dccpop_len	 = 0;
 
 	/* change feature */
@@ -523,7 +523,7 @@ int dccp_feat_clone(struct sock *oldsk, struct sock *newsk)
 		 * once...
 		 */
 		/* the master socket no longer needs to worry about confirms */
-		opt->dccpop_sc = 0; /* it's not a memleak---new socket has it */
+		opt->dccpop_sc = NULL; /* it's not a memleak---new socket has it */
 
 		/* reset state for a new socket */
 		opt->dccpop_conf = 0;