diff options
-rw-r--r-- | net/dccp/feat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/dccp/feat.c b/net/dccp/feat.c index e3dd30d36c8a..b39e2a597889 100644 --- a/net/dccp/feat.c +++ b/net/dccp/feat.c | |||
@@ -204,7 +204,7 @@ static int dccp_feat_reconcile(struct sock *sk, struct dccp_opt_pend *opt, | |||
204 | if (rc) { | 204 | if (rc) { |
205 | kfree(opt->dccpop_sc->dccpoc_val); | 205 | kfree(opt->dccpop_sc->dccpoc_val); |
206 | kfree(opt->dccpop_sc); | 206 | kfree(opt->dccpop_sc); |
207 | opt->dccpop_sc = 0; | 207 | opt->dccpop_sc = NULL; |
208 | return rc; | 208 | return rc; |
209 | } | 209 | } |
210 | 210 | ||
@@ -322,7 +322,7 @@ static void dccp_feat_empty_confirm(struct dccp_minisock *dmsk, | |||
322 | opt->dccpop_type = type == DCCPO_CHANGE_L ? DCCPO_CONFIRM_R : | 322 | opt->dccpop_type = type == DCCPO_CHANGE_L ? DCCPO_CONFIRM_R : |
323 | DCCPO_CONFIRM_L; | 323 | DCCPO_CONFIRM_L; |
324 | opt->dccpop_feat = feature; | 324 | opt->dccpop_feat = feature; |
325 | opt->dccpop_val = 0; | 325 | opt->dccpop_val = NULL; |
326 | opt->dccpop_len = 0; | 326 | opt->dccpop_len = 0; |
327 | 327 | ||
328 | /* change feature */ | 328 | /* change feature */ |
@@ -523,7 +523,7 @@ int dccp_feat_clone(struct sock *oldsk, struct sock *newsk) | |||
523 | * once... | 523 | * once... |
524 | */ | 524 | */ |
525 | /* the master socket no longer needs to worry about confirms */ | 525 | /* the master socket no longer needs to worry about confirms */ |
526 | opt->dccpop_sc = 0; /* it's not a memleak---new socket has it */ | 526 | opt->dccpop_sc = NULL; /* it's not a memleak---new socket has it */ |
527 | 527 | ||
528 | /* reset state for a new socket */ | 528 | /* reset state for a new socket */ |
529 | opt->dccpop_conf = 0; | 529 | opt->dccpop_conf = 0; |