diff --git a/[refs] b/[refs] index 3f7ebf89738e..e7c877745357 100644 --- 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 index cbf522dfecc4..528baa2e5be4 100644 --- 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 index 4e172ccfd76c..4aa1148cdb20 100644 --- 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 index 1cdf4ae99605..dafcefd86594 100644 --- 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);