From e4d8e285d09518a6228be2078bfaba57b18c2253 Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Sun, 7 Sep 2008 18:20:36 -0700 Subject: [PATCH] --- yaml --- r: 109673 b: refs/heads/master c: 51807e91a76a531d059ec7ce3395c435e4df52a8 h: refs/heads/master i: 109671: 47805e2af2b03655bfae76e6207d17e2794ad0b5 v: v3 --- [refs] | 2 +- trunk/net/netfilter/nf_conntrack_proto_gre.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f59e0dffae4f..5c455ef2344b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 887464a41fde7e9e1e11ca86748338033c502446 +refs/heads/master: 51807e91a76a531d059ec7ce3395c435e4df52a8 diff --git a/trunk/net/netfilter/nf_conntrack_proto_gre.c b/trunk/net/netfilter/nf_conntrack_proto_gre.c index b308bb4c12b9..9bd03967fea4 100644 --- a/trunk/net/netfilter/nf_conntrack_proto_gre.c +++ b/trunk/net/netfilter/nf_conntrack_proto_gre.c @@ -45,12 +45,12 @@ static LIST_HEAD(gre_keymap_list); void nf_ct_gre_keymap_flush(void) { - struct list_head *pos, *n; + struct nf_ct_gre_keymap *km, *tmp; write_lock_bh(&nf_ct_gre_lock); - list_for_each_safe(pos, n, &gre_keymap_list) { - list_del(pos); - kfree(pos); + list_for_each_entry_safe(km, tmp, &gre_keymap_list, list) { + list_del(&km->list); + kfree(km); } write_unlock_bh(&nf_ct_gre_lock); }