projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b2907e5
)
netfilter: nf_conntrack: elegantly simplify nf_ct_exp_net()
author
Alexey Dobriyan
<adobriyan@gmail.com>
Fri, 12 Feb 2010 05:24:46 +0000
(06:24 +0100)
committer
Patrick McHardy
<kaber@trash.net>
Fri, 12 Feb 2010 05:24:46 +0000
(06:24 +0100)
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>
include/net/netfilter/nf_conntrack_expect.h
patch
|
blob
|
history
diff --git
a/include/net/netfilter/nf_conntrack_expect.h
b/include/net/netfilter/nf_conntrack_expect.h
index
917e170
..
4b47ec1
100644
(file)
--- a/
include/net/netfilter/nf_conntrack_expect.h
+++ b/
include/net/netfilter/nf_conntrack_expect.h
@@
-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 {