diff options
| author |   Eric Dumazet <eric.dumazet@gmail.com> | 2010-06-01 06:51:19 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-06-02 05:16:23 -0700 |
| commit | c2d9ba9bce8d7323ca96f239e1f505c14d6244fb (patch) | |
| tree | 7a184eefa2e48e6aa15cdf3aefb6ccf2fb834320 /include/net/netfilter | |
| parent | ppp: eliminate shadowed variable name (diff) | |
| download | linux-dev-c2d9ba9bce8d7323ca96f239e1f505c14d6244fb.tar.xz linux-dev-c2d9ba9bce8d7323ca96f239e1f505c14d6244fb.zip | |
net: CONFIG_NET_NS reduction
Use read_pnet() and write_pnet() to reduce number of ifdef CONFIG_NET_NS
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/netfilter')
| -rw-r--r-- | include/net/netfilter/nf_conntrack.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index bde095f7e845..bbfdd9453087 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h @@ -152,11 +152,7 @@ extern struct net init_net; static inline struct net *nf_ct_net(const struct nf_conn *ct) { -#ifdef CONFIG_NET_NS - return ct->ct_net; -#else - return &init_net; -#endif + return read_pnet(&ct->ct_net); } /* Alter reply tuple (maybe alter helper). */ |