git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
net
/
ipv4
/
cipso_ipv4.c
diff --git
a/net/ipv4/cipso_ipv4.c
b/net/ipv4/cipso_ipv4.c
index
2e78f6b
..
e527990
100644
(file)
--- a/
net/ipv4/cipso_ipv4.c
+++ b/
net/ipv4/cipso_ipv4.c
@@
-490,7
+490,6
@@
int cipso_v4_doi_add(struct cipso_v4_doi *doi_def)
}
atomic_set(&doi_def->refcount, 1);
- INIT_RCU_HEAD(&doi_def->rcu);
spin_lock(&cipso_v4_doi_list_lock);
if (cipso_v4_doi_search(doi_def->doi) != NULL)