--- ./1/wrapper/src/main.c	2011-01-28 14:56:41.000000000 -0500
+++ ./2/wrapper/src/main.c	2011-01-28 14:55:36.000000000 -0500
@@ -475,11 +475,6 @@
 	struct sk_buff *linearized_skb = NULL;
 	const struct sk_buff *skb_use = NULL;
 
-	if (nf_ct_is_untracked(skb)){
-		pr_info ("xt_opendpi: ignoring untracked sk_buff.\n");
-		return false;               
-	}
-
 	if (skb_is_nonlinear(skb)){
 		linearized_skb = skb_copy(skb, GFP_ATOMIC);
 		if (linearized_skb == NULL) {
@@ -500,6 +495,17 @@
 
 		return false;
 	}
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
+	if (nf_ct_is_untracked(skb)){
+		pr_info ("xt_opendpi: ignoring untracked sk_buff.\n");
+#else
+	if (nf_ct_is_untracked(ct)){
+		pr_info ("xt_opendpi: ignoring untracked nf_conn.\n");
+#endif
+		return false;
+	}
+
 	do_gettimeofday(&tv);
 
 	time = ((uint64_t) tv.tv_sec) * detection_tick_resolution +