From 632c7e21b2bf777d4ed4d8ecc86f856db4b2ff7a Mon Sep 17 00:00:00 2001 From: Evgeniy Polyakov Date: Thu, 15 Nov 2007 15:52:32 -0800 Subject: [PATCH] --- yaml --- r: 73875 b: refs/heads/master c: 7799652557d966e49512479f4d3b9079bbc01fff h: refs/heads/master i: 73873: 5932fc35bf043a60f20125e3d89869fec9e337e1 73871: fb6fa4a4919540113a7a3c25080f732a9b250601 v: v3 --- [refs] | 2 +- trunk/net/netfilter/nf_conntrack_extend.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 315137f72f77..08965beabf65 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5a97263a9fd6a94f954d41ae3233ea65a90bd8a +refs/heads/master: 7799652557d966e49512479f4d3b9079bbc01fff diff --git a/trunk/net/netfilter/nf_conntrack_extend.c b/trunk/net/netfilter/nf_conntrack_extend.c index a1a65a1313b3..cf6ba6659a80 100644 --- a/trunk/net/netfilter/nf_conntrack_extend.c +++ b/trunk/net/netfilter/nf_conntrack_extend.c @@ -109,7 +109,7 @@ void *__nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp) rcu_read_lock(); t = rcu_dereference(nf_ct_ext_types[i]); if (t && t->move) - t->move(ct, ct->ext + ct->ext->offset[id]); + t->move(ct, ct->ext + ct->ext->offset[i]); rcu_read_unlock(); } kfree(ct->ext);