aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi RongQing <roy.qing.li@gmail.com>2014-10-11 13:03:34 +0800
committerDavid S. Miller <davem@davemloft.net>2014-10-14 13:15:15 -0400
commit02ea80741a25435123e8a5ca40cac6a0bcf0c9f1 (patch)
tree91af059eb3e25f4bbdd7a148c0d0226e057e5549
parentx86: bpf_jit: fix two bugs in eBPF JIT compiler (diff)
downloadlinux-dev-02ea80741a25435123e8a5ca40cac6a0bcf0c9f1.tar.xz
linux-dev-02ea80741a25435123e8a5ca40cac6a0bcf0c9f1.zip
ipv6: remove aca_lock spinlock from struct ifacaddr6
no user uses this lock. Signed-off-by: Li RongQing <roy.qing.li@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/if_inet6.h1
-rw-r--r--net/ipv6/anycast.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 55a8d4056cc9..98e5f9578f86 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -146,7 +146,6 @@ struct ifacaddr6 {
struct ifacaddr6 *aca_next;
int aca_users;
atomic_t aca_refcnt;
- spinlock_t aca_lock;
unsigned long aca_cstamp;
unsigned long aca_tstamp;
};
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c
index f5e319a8d4e2..baf2742d1ec4 100644
--- a/net/ipv6/anycast.c
+++ b/net/ipv6/anycast.c
@@ -235,7 +235,6 @@ static struct ifacaddr6 *aca_alloc(struct rt6_info *rt,
/* aca_tstamp should be updated upon changes */
aca->aca_cstamp = aca->aca_tstamp = jiffies;
atomic_set(&aca->aca_refcnt, 1);
- spin_lock_init(&aca->aca_lock);
return aca;
}