netns nf_conntrack: elegantly simplify nf_ct_exp_net()
Subsystems (2)
PATCH 1/1 netns 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 <[email protected]>
---
include/net/netfilter/nf_conntrack_expect.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
include/net/netfilter/nf_conntrack_expect.h +1 -5
@@ -56,11 +56,7 @@ struct nf_conntrack_expect {static inline struct net *nf_ct_exp_net (struct nf_conntrack_expect *exp) { -#ifdef CONFIG_NET_NS -return exp->master->ct_net;/* by definition */ -#else -return &init_net; -#endif +return nf_ct_net (exp->master); }struct nf_conntrack_expect_policy {
Patrick McHardy
AppliedQuoted 1 line · Alexey Dobriyan
Remove #ifdef at
nf_ct_exp_net()by usingnf_ct_net().
Applied, thanks.