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/sock.h | |
| parent | c6b20d941b08941bece53bc3d857beb1fb25fffc (diff) | |
| download | lwn-c2d9ba9bce8d7323ca96f239e1f505c14d6244fb.tar.gz lwn-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/sock.h')
| -rw-r--r-- | include/net/sock.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index ca241ea14875..3461e5d1e9ad 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1724,19 +1724,13 @@ static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb, int copied_e static inline struct net *sock_net(const struct sock *sk) { -#ifdef CONFIG_NET_NS - return sk->sk_net; -#else - return &init_net; -#endif + return read_pnet(&sk->sk_net); } static inline void sock_net_set(struct sock *sk, struct net *net) { -#ifdef CONFIG_NET_NS - sk->sk_net = net; -#endif + write_pnet(&sk->sk_net, net); } /* |