diff options
author | Gao feng <gaofeng@cn.fujitsu.com> | 2012-06-21 04:36:39 +0000 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-06-27 18:31:14 +0200 |
commit | f1caad274515ffd9841ac57ce9a7b5fc35bbf689 (patch) | |
tree | c0ba792ccbf5c6edb626240248dea904c21f7639 /net/netfilter/nf_conntrack_proto_gre.c | |
parent | fa0f61f05e401a3295b6486df67bb3f9d5f24a94 (diff) | |
download | op-kernel-dev-f1caad274515ffd9841ac57ce9a7b5fc35bbf689.zip op-kernel-dev-f1caad274515ffd9841ac57ce9a7b5fc35bbf689.tar.gz |
netfilter: nf_conntrack: prepare l4proto->init_net cleanup
l4proto->init contain quite redundant code. We can simplify this
by adding a new parameter l3proto.
This patch prepares that code simplification.
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_proto_gre.c')
-rw-r--r-- | net/netfilter/nf_conntrack_proto_gre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_proto_gre.c b/net/netfilter/nf_conntrack_proto_gre.c index 5cac41c..b09b7af 100644 --- a/net/netfilter/nf_conntrack_proto_gre.c +++ b/net/netfilter/nf_conntrack_proto_gre.c @@ -348,7 +348,7 @@ gre_timeout_nla_policy[CTA_TIMEOUT_GRE_MAX+1] = { }; #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ -static int gre_init_net(struct net *net) +static int gre_init_net(struct net *net, u_int16_t proto) { struct netns_proto_gre *net_gre = gre_pernet(net); int i; |