From 0b73ea177f265db00083388fc6e3dbac1caec548 Mon Sep 17 00:00:00 2001
From: Samir Bellabes <sbellabes@mandriva.com>
Date: Sat, 4 Feb 2006 02:16:06 -0800
Subject: [PATCH] --- yaml --- r: 19826 b: refs/heads/master c:
 df4e9574a36748c3a4d9b03ffca6b42321a797a9 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/net/netfilter/nf_conntrack_ftp.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 97cecf4e08ed..aa502545da48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19ea7302df2eb4f2ad7f29af814d8cf55fc8b9c9
+refs/heads/master: df4e9574a36748c3a4d9b03ffca6b42321a797a9
diff --git a/trunk/net/netfilter/nf_conntrack_ftp.c b/trunk/net/netfilter/nf_conntrack_ftp.c
index ab0c920f0d30..6f210f399762 100644
--- a/trunk/net/netfilter/nf_conntrack_ftp.c
+++ b/trunk/net/netfilter/nf_conntrack_ftp.c
@@ -657,8 +657,6 @@ static int __init init(void)
 	/* FIXME should be configurable whether IPv4 and IPv6 FTP connections
 		 are tracked or not - YK */
 	for (i = 0; i < ports_c; i++) {
-		memset(&ftp[i], 0, sizeof(struct nf_conntrack_helper));
-
 		ftp[i][0].tuple.src.l3num = PF_INET;
 		ftp[i][1].tuple.src.l3num = PF_INET6;
 		for (j = 0; j < 2; j++) {