aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2010-02-12 06:41:39 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-17 03:03:27 -0500
commitdc4c2c31053ba5bf685d273cd62ecca406dddb2d (patch)
treec74ac486ee668eec2a24d9a4191a855fb0eed8af /net/ipv6
parentf6ca057f1bfe251d944505fc5ba4df3762802539 (diff)
net: remove INIT_RCU_HEAD() usage
call_rcu() will unconditionally reinitialize RCU head anyway. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/sit.c1
-rw-r--r--net/ipv6/xfrm6_tunnel.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 52ffd29cb93f..96eb2d4641c4 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -363,7 +363,6 @@ ipip6_tunnel_add_prl(struct ip_tunnel *t, struct ip_tunnel_prl *a, int chg)
363 goto out; 363 goto out;
364 } 364 }
365 365
366 INIT_RCU_HEAD(&p->rcu_head);
367 p->next = t->prl; 366 p->next = t->prl;
368 p->addr = a->addr; 367 p->addr = a->addr;
369 p->flags = a->flags; 368 p->flags = a->flags;
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c
index ddce21e3459b..fa85a7d22dc4 100644
--- a/net/ipv6/xfrm6_tunnel.c
+++ b/net/ipv6/xfrm6_tunnel.c
@@ -161,7 +161,6 @@ alloc_spi:
161 if (!x6spi) 161 if (!x6spi)
162 goto out; 162 goto out;
163 163
164 INIT_RCU_HEAD(&x6spi->rcu_head);
165 memcpy(&x6spi->addr, saddr, sizeof(x6spi->addr)); 164 memcpy(&x6spi->addr, saddr, sizeof(x6spi->addr));
166 x6spi->spi = spi; 165 x6spi->spi = spi;
167 atomic_set(&x6spi->refcnt, 1); 166 atomic_set(&x6spi->refcnt, 1);