diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-07 16:18:50 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-07 16:18:50 -0700 |
| commit | d3a5ea6e2188adeea028c410c83c90e6b6d9347c (patch) | |
| tree | 7035d790158da6fad3c482afa545b3dba2e6b037 /include/net | |
| parent | 8ce5c9f27d2e2ce415d903d916e848a356d4c0c0 (diff) | |
| parent | 46ba5a25f521e3c50d7bb81b1abb977769047456 (diff) | |
Merge branch 'master' of git://1984.lsi.us.es/nf-next
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_l4proto.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h index 81c52b5205f2..c3be4aef6bf7 100644 --- a/include/net/netfilter/nf_conntrack_l4proto.h +++ b/include/net/netfilter/nf_conntrack_l4proto.h @@ -97,7 +97,10 @@ struct nf_conntrack_l4proto { #endif int *net_id; /* Init l4proto pernet data */ - int (*init_net)(struct net *net); + int (*init_net)(struct net *net, u_int16_t proto); + + /* Return the per-net protocol part. */ + struct nf_proto_net *(*get_net_proto)(struct net *net); /* Protocol name */ const char *name; @@ -124,6 +127,14 @@ extern int nf_conntrack_l4proto_register(struct net *net, extern void nf_conntrack_l4proto_unregister(struct net *net, struct nf_conntrack_l4proto *proto); +static inline void nf_ct_kfree_compat_sysctl_table(struct nf_proto_net *pn) +{ +#if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT) + kfree(pn->ctl_compat_table); + pn->ctl_compat_table = NULL; +#endif +} + /* Generic netlink helpers */ extern int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb, const struct nf_conntrack_tuple *tuple); |