From d82b20ead7ffd7a3ccd0f0ccdc7ee34f33a9c51b Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@medozas.de>
Date: Wed, 12 Jan 2011 01:03:36 +0100
Subject: [PATCH] xt_LOGMARK: fix detection of untracked connection for Linux
 >= 2.6.36

---
 doc/changelog.txt       | 2 ++
 extensions/xt_LOGMARK.c | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 0db44ae..8c8018f 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,6 +1,8 @@
 
 HEAD
 ====
+Fixes:
+- xt_LOGMARK: fix detection of untracked connection for Linux >= 2.6.36
 
 
 v1.32 (2011-01-04)
diff --git a/extensions/xt_LOGMARK.c b/extensions/xt_LOGMARK.c
index b368d28..bf76dec 100644
--- a/extensions/xt_LOGMARK.c
+++ b/extensions/xt_LOGMARK.c
@@ -48,8 +48,13 @@ logmark_tg(struct sk_buff **pskb, const struct xt_action_param *par)
 	printk(" ctdir=%s", dir_names[ctinfo >= IP_CT_IS_REPLY]);
 	if (ct == NULL) {
 		printk(" ct=NULL ctmark=NULL ctstate=INVALID ctstatus=NONE");
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
+	} else if (nf_ct_is_untracked(ct)) {
+		printk(" ct=UNTRACKED ctmark=NULL ctstate=UNTRACKED ctstatus=NONE");
+#else
 	} else if (ct == &nf_conntrack_untracked) {
 		printk(" ct=UNTRACKED ctmark=NULL ctstate=UNTRACKED ctstatus=NONE");
+#endif
 	} else {
 		printk(" ct=0x%p ctmark=0x%x ctstate=", ct, ct->mark);
 		ctinfo %= IP_CT_IS_REPLY;