aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-11-25 20:13:59 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-25 20:13:59 -0500
commitc95839693d2a6612af7f75ad877012eba2f69757 (patch)
tree44b7ec37fa12e8824e527840c9e68994d415a659
parent46a8494a9de6b88a126993e6012322752f997b88 (diff)
xfrm: initialise xfrm_policy_gc_work statically
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/xfrm/xfrm_policy.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 17854884f6ff..ea3456daa9cb 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -55,7 +55,6 @@ static struct xfrm_policy_afinfo *xfrm_policy_afinfo[NPROTO];
55 55
56static struct kmem_cache *xfrm_dst_cache __read_mostly; 56static struct kmem_cache *xfrm_dst_cache __read_mostly;
57 57
58static struct work_struct xfrm_policy_gc_work;
59static HLIST_HEAD(xfrm_policy_gc_list); 58static HLIST_HEAD(xfrm_policy_gc_list);
60static DEFINE_SPINLOCK(xfrm_policy_gc_lock); 59static DEFINE_SPINLOCK(xfrm_policy_gc_lock);
61 60
@@ -296,6 +295,7 @@ static void xfrm_policy_gc_task(struct work_struct *work)
296 hlist_for_each_entry_safe(policy, entry, tmp, &gc_list, bydst) 295 hlist_for_each_entry_safe(policy, entry, tmp, &gc_list, bydst)
297 xfrm_policy_gc_kill(policy); 296 xfrm_policy_gc_kill(policy);
298} 297}
298static DECLARE_WORK(xfrm_policy_gc_work, xfrm_policy_gc_task);
299 299
300/* Rule must be locked. Release descentant resources, announce 300/* Rule must be locked. Release descentant resources, announce
301 * entry dead. The rule must be unlinked from lists to the moment. 301 * entry dead. The rule must be unlinked from lists to the moment.
@@ -2425,7 +2425,6 @@ static void __init xfrm_policy_init(void)
2425 } 2425 }
2426 2426
2427 INIT_LIST_HEAD(&xfrm_policy_all); 2427 INIT_LIST_HEAD(&xfrm_policy_all);
2428 INIT_WORK(&xfrm_policy_gc_work, xfrm_policy_gc_task);
2429 register_netdevice_notifier(&xfrm_dev_notifier); 2428 register_netdevice_notifier(&xfrm_dev_notifier);
2430} 2429}
2431 2430