于 2012年05月23日 18:41, Pablo Neira Ayuso 写道: > On Mon, May 14, 2012 at 04:52:26PM +0800, Gao feng wrote: >> add struct net as a param of ctnl_timeout.nlattr_to_obj, >> >> modify ctnl_timeout_parse_policy and cttimeout_new_timeout >> to transmit struct net to nlattr_to_obj. > > Please, merge your patch 16 and 17 into one single patch. > >> unsigned int *timeouts = data; >> >> diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c >> index 291cef4..a28f3c4 100644 >> --- a/net/netfilter/nf_conntrack_proto_sctp.c >> +++ b/net/netfilter/nf_conntrack_proto_sctp.c >> @@ -562,7 +562,8 @@ static int sctp_nlattr_size(void) >> #include <linux/netfilter/nfnetlink.h> >> #include <linux/netfilter/nfnetlink_cttimeout.h> >> >> -static int sctp_timeout_nlattr_to_obj(struct nlattr *tb[], void *data) >> +static int sctp_timeout_nlattr_to_obj(struct nlattr *tb[], >> + struct net *net, void *data) > > The interface modification and the use of the new *net parameter > should go together, ie. merge patch 16 and 17 :-). got it,thanks ;) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
