From 727f64563ad18410a5915a2156bef0e3022c811d Mon Sep 17 00:00:00 2001
From: Shan Wei <shanwei@cn.fujitsu.com>
Date: Wed, 20 Jan 2010 10:39:14 +0100
Subject: [PATCH] --- yaml --- r: 184142 b: refs/heads/master c:
 b38f6eddeee510ce8178c2d2db54ed25f1d7cb63 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 95d6a08b33ec..24101d4416a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5d896adf019143adf72d08826fe5359b6a8762c
+refs/heads/master: b38f6eddeee510ce8178c2d2db54ed25f1d7cb63
diff --git a/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c b/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c
index 312c20adc83f..1030ce1e6c79 100644
--- a/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -45,9 +45,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 
-#define NF_CT_FRAG6_HIGH_THRESH 262144 /* == 256*1024 */
-#define NF_CT_FRAG6_LOW_THRESH 196608  /* == 192*1024 */
-#define NF_CT_FRAG6_TIMEOUT IPV6_FRAG_TIMEOUT
 
 struct nf_ct_frag6_skb_cb
 {