From 2d399a1263bbf50f40a765291e8752cf8c5a7997 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 24 Nov 2008 18:34:48 +0100 Subject: [PATCH] --- yaml --- r: 122383 b: refs/heads/master c: 4813eadf6b17caa7fcce67ac2f929a3dd5178fa2 h: refs/heads/master i: 122381: 07f9d062ae6f1b12d6054243754e21d3873dc5ef 122379: 618c4b2f581af9770e4ce15196a34ee876504253 122375: de0b32a12118ed5e753793c1a8db171aa24934d8 122367: b6d9ffbbeb5d838e64e46e4ef3da9073a0dde514 v: v3 --- [refs] | 2 +- trunk/net/netfilter/nf_conntrack_ftp.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 267d5f4ef0f4..855fa2ce5ce5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 328bd8997dbb7184d5389e45c642af44ae6e9043 +refs/heads/master: 4813eadf6b17caa7fcce67ac2f929a3dd5178fa2 diff --git a/trunk/net/netfilter/nf_conntrack_ftp.c b/trunk/net/netfilter/nf_conntrack_ftp.c index 703a4378074a..867cad6b3c8d 100644 --- a/trunk/net/netfilter/nf_conntrack_ftp.c +++ b/trunk/net/netfilter/nf_conntrack_ftp.c @@ -428,10 +428,8 @@ static int help(struct sk_buff *skb, connection tracking, not packet filtering. However, it is necessary for accurate tracking in this case. */ - if (net_ratelimit()) - printk("conntrack_ftp: partial %s %u+%u\n", - search[dir][i].pattern, - ntohl(th->seq), datalen); + pr_debug("conntrack_ftp: partial %s %u+%u\n", + search[dir][i].pattern, ntohl(th->seq), datalen); ret = NF_DROP; goto out; } else if (found == 0) { /* No match */