diff options
author | Li RongQing <roy.qing.li@gmail.com> | 2015-04-22 03:51:16 -0400 |
---|---|---|
committer | Steffen Klassert <steffen.klassert@secunet.com> | 2015-04-23 05:35:47 -0400 |
commit | 1ee5e6676bccbf7a035d8d35c143f1a61e602198 (patch) | |
tree | 5a744937467dc4ac44da72570a7f6f8d290c19e6 /net/xfrm | |
parent | 04b7fe6a4a231871ef681bc95e08fe66992f7b1f (diff) |
xfrm: remove the xfrm_queue_purge definition
The task of xfrm_queue_purge is same as skb_queue_purge, so remove it
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/xfrm')
-rw-r--r-- | net/xfrm/xfrm_policy.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 638af0655aaf..d8c35ad4210d 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
@@ -315,14 +315,6 @@ void xfrm_policy_destroy(struct xfrm_policy *policy) | |||
315 | } | 315 | } |
316 | EXPORT_SYMBOL(xfrm_policy_destroy); | 316 | EXPORT_SYMBOL(xfrm_policy_destroy); |
317 | 317 | ||
318 | static void xfrm_queue_purge(struct sk_buff_head *list) | ||
319 | { | ||
320 | struct sk_buff *skb; | ||
321 | |||
322 | while ((skb = skb_dequeue(list)) != NULL) | ||
323 | kfree_skb(skb); | ||
324 | } | ||
325 | |||
326 | /* Rule must be locked. Release descentant resources, announce | 318 | /* Rule must be locked. Release descentant resources, announce |
327 | * entry dead. The rule must be unlinked from lists to the moment. | 319 | * entry dead. The rule must be unlinked from lists to the moment. |
328 | */ | 320 | */ |
@@ -335,7 +327,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy) | |||
335 | 327 | ||
336 | if (del_timer(&policy->polq.hold_timer)) | 328 | if (del_timer(&policy->polq.hold_timer)) |
337 | xfrm_pol_put(policy); | 329 | xfrm_pol_put(policy); |
338 | xfrm_queue_purge(&policy->polq.hold_queue); | 330 | skb_queue_purge(&policy->polq.hold_queue); |
339 | 331 | ||
340 | if (del_timer(&policy->timer)) | 332 | if (del_timer(&policy->timer)) |
341 | xfrm_pol_put(policy); | 333 | xfrm_pol_put(policy); |
@@ -1955,7 +1947,7 @@ out: | |||
1955 | 1947 | ||
1956 | purge_queue: | 1948 | purge_queue: |
1957 | pq->timeout = 0; | 1949 | pq->timeout = 0; |
1958 | xfrm_queue_purge(&pq->hold_queue); | 1950 | skb_queue_purge(&pq->hold_queue); |
1959 | xfrm_pol_put(pol); | 1951 | xfrm_pol_put(pol); |
1960 | } | 1952 | } |
1961 | 1953 | ||