diff options
| author | Amerigo Wang <amwang@redhat.com> | 2012-11-11 21:52:34 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-14 18:49:50 -0500 |
| commit | e086cadc08e259150b2ab8f7f4a16dbf9e3c2f22 (patch) | |
| tree | 38ef29e21c125dcb9f8fd75749416e4839c84469 /net/ipv4/ip_vti.c | |
| parent | aa0010f880ab542da3ad0e72992f2dc518ac68a0 (diff) | |
| download | linux-3.10-e086cadc08e259150b2ab8f7f4a16dbf9e3c2f22.tar.gz linux-3.10-e086cadc08e259150b2ab8f7f4a16dbf9e3c2f22.tar.bz2 linux-3.10-e086cadc08e259150b2ab8f7f4a16dbf9e3c2f22.zip | |
net: unify for_each_ip_tunnel_rcu()
The defitions of for_each_ip_tunnel_rcu() are same,
so unify it. Also, don't hide the parameter 't'.
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_vti.c')
| -rw-r--r-- | net/ipv4/ip_vti.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index e0f2c88f03c..516188b0dc1 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -66,11 +66,6 @@ static void vti_tunnel_setup(struct net_device *dev); static void vti_dev_free(struct net_device *dev); static int vti_tunnel_bind_dev(struct net_device *dev); -/* Locking : hash tables are protected by RCU and RTNL */ - -#define for_each_ip_tunnel_rcu(start) \ - for (t = rcu_dereference(start); t; t = rcu_dereference(t->next)) - #define VTI_XMIT(stats1, stats2) do { \ int err; \ int pkt_len = skb->len; \ @@ -133,19 +128,19 @@ static struct ip_tunnel *vti_tunnel_lookup(struct net *net, struct ip_tunnel *t; struct vti_net *ipn = net_generic(net, vti_net_id); - for_each_ip_tunnel_rcu(ipn->tunnels_r_l[h0 ^ h1]) + for_each_ip_tunnel_rcu(t, ipn->tunnels_r_l[h0 ^ h1]) if (local == t->parms.iph.saddr && remote == t->parms.iph.daddr && (t->dev->flags&IFF_UP)) return t; - for_each_ip_tunnel_rcu(ipn->tunnels_r[h0]) + for_each_ip_tunnel_rcu(t, ipn->tunnels_r[h0]) if (remote == t->parms.iph.daddr && (t->dev->flags&IFF_UP)) return t; - for_each_ip_tunnel_rcu(ipn->tunnels_l[h1]) + for_each_ip_tunnel_rcu(t, ipn->tunnels_l[h1]) if (local == t->parms.iph.saddr && (t->dev->flags&IFF_UP)) return t; - for_each_ip_tunnel_rcu(ipn->tunnels_wc[0]) + for_each_ip_tunnel_rcu(t, ipn->tunnels_wc[0]) if (t && (t->dev->flags&IFF_UP)) return t; return NULL; |