aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-04-20 17:14:21 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:29:03 -0400
commitaf65bdfce98d7965fbe93a48b8128444a2eea024 (patch)
treee6ac5ff82a0d5067213135cdf049b912b02e824d /net/xfrm
parentb076deb8498e26c9aa2f44046fe5e9936ae2fb5a (diff)
[NETLINK]: Switch cb_lock spinlock to mutex and allow to override it
Switch cb_lock to mutex and allow netlink kernel users to override it with a subsystem specific mutex for consistent locking in dump callbacks. All netlink_dump_start users have been audited not to rely on any side-effects of the previously used spinlock. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
-rw-r--r--net/xfrm/xfrm_user.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 2ff968373f1..88659edc9b1 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -2444,7 +2444,7 @@ static int __init xfrm_user_init(void)
2444 printk(KERN_INFO "Initializing XFRM netlink socket\n"); 2444 printk(KERN_INFO "Initializing XFRM netlink socket\n");
2445 2445
2446 nlsk = netlink_kernel_create(NETLINK_XFRM, XFRMNLGRP_MAX, 2446 nlsk = netlink_kernel_create(NETLINK_XFRM, XFRMNLGRP_MAX,
2447 xfrm_netlink_rcv, THIS_MODULE); 2447 xfrm_netlink_rcv, NULL, THIS_MODULE);
2448 if (nlsk == NULL) 2448 if (nlsk == NULL)
2449 return -ENOMEM; 2449 return -ENOMEM;
2450 rcu_assign_pointer(xfrm_nl, nlsk); 2450 rcu_assign_pointer(xfrm_nl, nlsk);