aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/ip_vti.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index c41b5c359936..3511ffba7bd4 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -55,7 +55,7 @@ struct vti_net {
55 struct ip_tunnel __rcu *tunnels_r[HASH_SIZE]; 55 struct ip_tunnel __rcu *tunnels_r[HASH_SIZE];
56 struct ip_tunnel __rcu *tunnels_l[HASH_SIZE]; 56 struct ip_tunnel __rcu *tunnels_l[HASH_SIZE];
57 struct ip_tunnel __rcu *tunnels_wc[1]; 57 struct ip_tunnel __rcu *tunnels_wc[1];
58 struct ip_tunnel **tunnels[4]; 58 struct ip_tunnel __rcu **tunnels[4];
59 59
60 struct net_device *fb_tunnel_dev; 60 struct net_device *fb_tunnel_dev;
61}; 61};
@@ -160,8 +160,8 @@ static struct ip_tunnel *vti_tunnel_lookup(struct net *net,
160 return NULL; 160 return NULL;
161} 161}
162 162
163static struct ip_tunnel **__vti_bucket(struct vti_net *ipn, 163static struct ip_tunnel __rcu **__vti_bucket(struct vti_net *ipn,
164 struct ip_tunnel_parm *parms) 164 struct ip_tunnel_parm *parms)
165{ 165{
166 __be32 remote = parms->iph.daddr; 166 __be32 remote = parms->iph.daddr;
167 __be32 local = parms->iph.saddr; 167 __be32 local = parms->iph.saddr;
@@ -179,8 +179,8 @@ static struct ip_tunnel **__vti_bucket(struct vti_net *ipn,
179 return &ipn->tunnels[prio][h]; 179 return &ipn->tunnels[prio][h];
180} 180}
181 181
182static inline struct ip_tunnel **vti_bucket(struct vti_net *ipn, 182static inline struct ip_tunnel __rcu **vti_bucket(struct vti_net *ipn,
183 struct ip_tunnel *t) 183 struct ip_tunnel *t)
184{ 184{
185 return __vti_bucket(ipn, &t->parms); 185 return __vti_bucket(ipn, &t->parms);
186} 186}