| Your code doesn't quite match your description as removing one line of | code from a function. I'm assuming this is OK but raising it just in | case. | Thanks - I have put the hunk below into the earlier patch "[DCCP]: Cleanup routines for feature negotiation" The function dccp_feat_clean() is removed by this patch (5/14), and the hunk below can go into the earlier patch without problems (compile-tested the exchange). | | > --- a/net/dccp/proto.c | > +++ b/net/dccp/proto.c | > @@ -234,7 +234,6 @@ int 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); | > | > return 0; | > - | - To unsubscribe from this list: send the line "unsubscribe dccp" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html