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
Bluetooth: Fix l2cap_sock_setsockopt() with optname BT_RCVMTU
[pandora-kernel.git]
/
net
/
netfilter
/
nf_conntrack_ecache.c
diff --git
a/net/netfilter/nf_conntrack_ecache.c
b/net/netfilter/nf_conntrack_ecache.c
index
b62c414
..
14af632
100644
(file)
--- a/
net/netfilter/nf_conntrack_ecache.c
+++ b/
net/netfilter/nf_conntrack_ecache.c
@@
-91,7
+91,7
@@
int nf_conntrack_register_notifier(struct net *net,
ret = -EBUSY;
goto out_unlock;
}
ret = -EBUSY;
goto out_unlock;
}
-
RCU_INIT_POINTER
(net->ct.nf_conntrack_event_cb, new);
+
rcu_assign_pointer
(net->ct.nf_conntrack_event_cb, new);
mutex_unlock(&nf_ct_ecache_mutex);
return ret;
mutex_unlock(&nf_ct_ecache_mutex);
return ret;
@@
-128,7
+128,7
@@
int nf_ct_expect_register_notifier(struct net *net,
ret = -EBUSY;
goto out_unlock;
}
ret = -EBUSY;
goto out_unlock;
}
-
RCU_INIT_POINTER
(net->ct.nf_expect_event_cb, new);
+
rcu_assign_pointer
(net->ct.nf_expect_event_cb, new);
mutex_unlock(&nf_ct_ecache_mutex);
return ret;
mutex_unlock(&nf_ct_ecache_mutex);
return ret;