diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2012-09-10 22:09:44 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-18 15:57:03 -0400 |
| commit | b42664f898c976247f7f609b8bb9c94d7475ca10 (patch) | |
| tree | b98e4d5d57b21d0a9dc8882bdc29e7cc7c6beccf /include/net | |
| parent | 2885da72966fcb89f48d554339d347fb02b5ea78 (diff) | |
| download | lwn-b42664f898c976247f7f609b8bb9c94d7475ca10.tar.gz lwn-b42664f898c976247f7f609b8bb9c94d7475ca10.zip | |
netns: move net->ipv4.rt_genid to net->rt_genid
This commit prepares the use of rt_genid by both IPv4 and IPv6.
Initialization is left in IPv4 part.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/net_namespace.h | 10 | ||||
| -rw-r--r-- | include/net/netns/ipv4.h | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index ae1cd6c9ba52..fd87963a0ea5 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -102,6 +102,7 @@ struct net { #endif struct netns_ipvs *ipvs; struct sock *diag_nlsk; + atomic_t rt_genid; }; @@ -300,5 +301,14 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header) } #endif +static inline int rt_genid(struct net *net) +{ + return atomic_read(&net->rt_genid); +} + +static inline void rt_genid_bump(struct net *net) +{ + atomic_inc(&net->rt_genid); +} #endif /* __NET_NET_NAMESPACE_H */ diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index 1474dd65c66f..eb24dbccd81e 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h @@ -65,7 +65,6 @@ struct netns_ipv4 { unsigned int sysctl_ping_group_range[2]; long sysctl_tcp_mem[3]; - atomic_t rt_genid; atomic_t dev_addr_genid; #ifdef CONFIG_IP_MROUTE |