diff options
Diffstat (limited to 'net/xfrm/xfrm_policy.c')
-rw-r--r-- | net/xfrm/xfrm_policy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 7736b23c3f03..ba924d40df7d 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
@@ -358,7 +358,7 @@ static void xfrm_policy_gc_kill(struct xfrm_policy *policy) | |||
358 | xfrm_pol_put(policy); | 358 | xfrm_pol_put(policy); |
359 | } | 359 | } |
360 | 360 | ||
361 | static void xfrm_policy_gc_task(void *data) | 361 | static void xfrm_policy_gc_task(struct work_struct *work) |
362 | { | 362 | { |
363 | struct xfrm_policy *policy; | 363 | struct xfrm_policy *policy; |
364 | struct hlist_node *entry, *tmp; | 364 | struct hlist_node *entry, *tmp; |
@@ -546,7 +546,7 @@ static inline int xfrm_byidx_should_resize(int total) | |||
546 | 546 | ||
547 | static DEFINE_MUTEX(hash_resize_mutex); | 547 | static DEFINE_MUTEX(hash_resize_mutex); |
548 | 548 | ||
549 | static void xfrm_hash_resize(void *__unused) | 549 | static void xfrm_hash_resize(struct work_struct *__unused) |
550 | { | 550 | { |
551 | int dir, total; | 551 | int dir, total; |
552 | 552 | ||
@@ -563,7 +563,7 @@ static void xfrm_hash_resize(void *__unused) | |||
563 | mutex_unlock(&hash_resize_mutex); | 563 | mutex_unlock(&hash_resize_mutex); |
564 | } | 564 | } |
565 | 565 | ||
566 | static DECLARE_WORK(xfrm_hash_work, xfrm_hash_resize, NULL); | 566 | static DECLARE_WORK(xfrm_hash_work, xfrm_hash_resize); |
567 | 567 | ||
568 | /* Generate new index... KAME seems to generate them ordered by cost | 568 | /* Generate new index... KAME seems to generate them ordered by cost |
569 | * of an absolute inpredictability of ordering of rules. This will not pass. */ | 569 | * of an absolute inpredictability of ordering of rules. This will not pass. */ |
@@ -2080,7 +2080,7 @@ static void __init xfrm_policy_init(void) | |||
2080 | panic("XFRM: failed to allocate bydst hash\n"); | 2080 | panic("XFRM: failed to allocate bydst hash\n"); |
2081 | } | 2081 | } |
2082 | 2082 | ||
2083 | INIT_WORK(&xfrm_policy_gc_work, xfrm_policy_gc_task, NULL); | 2083 | INIT_WORK(&xfrm_policy_gc_work, xfrm_policy_gc_task); |
2084 | register_netdevice_notifier(&xfrm_dev_notifier); | 2084 | register_netdevice_notifier(&xfrm_dev_notifier); |
2085 | } | 2085 | } |
2086 | 2086 | ||