diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-02-12 00:24:46 -0500 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-02-12 00:24:46 -0500 |
| commit | 857b409a48bdc33e824dff2d730e271b964e78bd (patch) | |
| tree | 99337dfe00cfa2f0d016589229c05908a5d6dcb2 /include/net | |
| parent | b2907e501945d5d13326a6a7441c13e41cd0e799 (diff) | |
netfilter: nf_conntrack: elegantly simplify nf_ct_exp_net()
Remove #ifdef at nf_ct_exp_net() by using nf_ct_net().
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_expect.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h index 917e170fa752..4b47ec19ef39 100644 --- a/include/net/netfilter/nf_conntrack_expect.h +++ b/include/net/netfilter/nf_conntrack_expect.h | |||
| @@ -56,11 +56,7 @@ struct nf_conntrack_expect { | |||
| 56 | 56 | ||
| 57 | static inline struct net *nf_ct_exp_net(struct nf_conntrack_expect *exp) | 57 | static inline struct net *nf_ct_exp_net(struct nf_conntrack_expect *exp) |
| 58 | { | 58 | { |
| 59 | #ifdef CONFIG_NET_NS | 59 | return nf_ct_net(exp->master); |
| 60 | return exp->master->ct_net; /* by definition */ | ||
| 61 | #else | ||
| 62 | return &init_net; | ||
| 63 | #endif | ||
| 64 | } | 60 | } |
| 65 | 61 | ||
| 66 | struct nf_conntrack_expect_policy { | 62 | struct nf_conntrack_expect_policy { |