---

yaml --- r: 121720 b: refs/heads/master c: d99a7bd h: refs/heads/master v: v3
git-mirror · Nov 5, 2008 · 8b04d02 · 8b04d02
1 parent f16019f
commit 8b04d02
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac75773c2742d82cbcb078708df406e9017224b7
+refs/heads/master: d99a7bd210a14001007fc5233597c78877f0a11c
diff --git a/trunk/net/dccp/ipv4.c b/trunk/net/dccp/ipv4.c
@@ -545,6 +545,7 @@ static void dccp_v4_ctl_send_reset(struct sock *sk, struct sk_buff *rxskb)
 
 static void dccp_v4_reqsk_destructor(struct request_sock *req)
 {
+	dccp_feat_list_purge(&dccp_rsk(req)->dreq_featneg);
 	kfree(inet_rsk(req)->opt);
 }
 

diff --git a/trunk/net/dccp/ipv6.c b/trunk/net/dccp/ipv6.c
@@ -304,6 +304,7 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req)
 
 static void dccp_v6_reqsk_destructor(struct request_sock *req)
 {
+	dccp_feat_list_purge(&dccp_rsk(req)->dreq_featneg);
 	if (inet6_rsk(req)->pktopts != NULL)
 		kfree_skb(inet6_rsk(req)->pktopts);
 }

diff --git a/trunk/net/dccp/proto.c b/trunk/net/dccp/proto.c
@@ -268,7 +268,7 @@ void dccp_destroy_sock(struct sock *sk)
 	dp->dccps_hc_rx_ccid = dp->dccps_hc_tx_ccid = NULL;
 
 	/* clean up feature negotiation state */
-	dccp_feat_clean(dmsk);
+	dccp_feat_list_purge(&dp->dccps_featneg);
 }
 
 EXPORT_SYMBOL_GPL(dccp_destroy_sock);
-Original file line number
+Diff line change
@@ Expand Up @@
     static void dccp_v4_reqsk_destructor(struct request_sock *req)
     {
+    	dccp_feat_list_purge(&dccp_rsk(req)->dreq_featneg);
     	kfree(inet_rsk(req)->opt);
     }
@@ Expand Down @@