From 1dd50b9474a198802b16fb6259aeb60004cc7338 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Sat, 26 Jul 2008 17:50:05 -0700
Subject: [PATCH] --- yaml --- r: 106336 b: refs/heads/master c:
 6c64825bf40ecc1b01610762ca736b18c8a9db92 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/net/netfilter/nf_conntrack_extend.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c53c27ece464..ac0399439c41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93bc4e89c260d91576840c4881d1066d84ccd422
+refs/heads/master: 6c64825bf40ecc1b01610762ca736b18c8a9db92
diff --git a/trunk/net/netfilter/nf_conntrack_extend.c b/trunk/net/netfilter/nf_conntrack_extend.c
index c956ef7eeecb..4b2c769d555f 100644
--- a/trunk/net/netfilter/nf_conntrack_extend.c
+++ b/trunk/net/netfilter/nf_conntrack_extend.c
@@ -115,10 +115,10 @@ void *__nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp)
 		ct->ext = new;
 	}
 
-	ct->ext->offset[id] = newoff;
-	ct->ext->len = newlen;
-	memset((void *)ct->ext + newoff, 0, newlen - newoff);
-	return (void *)ct->ext + newoff;
+	new->offset[id] = newoff;
+	new->len = newlen;
+	memset((void *)new + newoff, 0, newlen - newoff);
+	return (void *)new + newoff;
 }
 EXPORT_SYMBOL(__nf_ct_ext_add);