projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge linux-stable 3.0.28 into android-3.0
[firefly-linux-kernel-4.4.55.git]
/
include
/
net
/
ipip.h
diff --git
a/include/net/ipip.h
b/include/net/ipip.h
index 58abbf966b0c816a3f22d0060fa0ad8aa08113ea..a32654d52730d751a4c89dd8f8fea98b57add370 100644
(file)
--- a/
include/net/ipip.h
+++ b/
include/net/ipip.h
@@
-16,7
+16,7
@@
struct ip_tunnel_6rd_parm {
};
struct ip_tunnel {
};
struct ip_tunnel {
- struct ip_tunnel
*next;
+ struct ip_tunnel
__rcu
*next;
struct net_device *dev;
int err_count; /* Number of arrived ICMP errors */
struct net_device *dev;
int err_count; /* Number of arrived ICMP errors */
@@
-34,12
+34,12
@@
struct ip_tunnel {
#ifdef CONFIG_IPV6_SIT_6RD
struct ip_tunnel_6rd_parm ip6rd;
#endif
#ifdef CONFIG_IPV6_SIT_6RD
struct ip_tunnel_6rd_parm ip6rd;
#endif
- struct ip_tunnel_prl_entry
*prl;
/* potential router list */
+ struct ip_tunnel_prl_entry
__rcu *prl;
/* potential router list */
unsigned int prl_count; /* # of entries in PRL */
};
struct ip_tunnel_prl_entry {
unsigned int prl_count; /* # of entries in PRL */
};
struct ip_tunnel_prl_entry {
- struct ip_tunnel_prl_entry
*next;
+ struct ip_tunnel_prl_entry
__rcu
*next;
__be32 addr;
u16 flags;
struct rcu_head rcu_head;
__be32 addr;
u16 flags;
struct rcu_head rcu_head;