projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pm-for-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
include
/
net
/
net_namespace.h
diff --git
a/include/net/net_namespace.h
b/include/net/net_namespace.h
index d61e2b36d9e32227f36dc9b4d935a05e554c7478..4faf6612ecacc05d2b00877691e440338ebb0144 100644
(file)
--- a/
include/net/net_namespace.h
+++ b/
include/net/net_namespace.h
@@
-110,6
+110,7
@@
struct net {
#endif
struct netns_ipvs *ipvs;
struct sock *diag_nlsk;
#endif
struct netns_ipvs *ipvs;
struct sock *diag_nlsk;
+ atomic_t rt_genid;
};
/*
};
/*
@@
-315,5
+316,14
@@
static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
}
#endif
}
#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 */
#endif /* __NET_NET_NAMESPACE_H */