Remove dependency on CONFIG_NETWORK_SECMARK

diff --git a/INSTALL b/INSTALL
index ffdc2b35d6644079da4f95da54cb59289314d3ae..1e2c057e3dfdcfd2adff3069b3d38090c43ac193 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -19,6 +19,9 @@ Prerequirements
          - or the xtables-combined tarball that is currently distributed
 
        * kernel-source >= 2.6.18.5 with prepared build/output directory
+         - CONFIG_NF_CONNTRACK or CONFIG_IP_NF_CONNTRACK
+         - CONFIG_NF_CONNTRACK_MARK or CONFIG_IP_NF_CONNTRACK_MARK
+           enabled =y or as module (=m)
 
 
 Selecting extensions

diff --git a/extensions/compat_skbuff.h b/extensions/compat_skbuff.h
index b46976dcdfb7063b28a3d388a41ef9836f6ee700..b32bbf55a11be5a734dde40a3220de33dfcd7ed9 100644 (file)
--- a/extensions/compat_skbuff.h
+++ b/extensions/compat_skbuff.h
@@ -10,6 +10,12 @@ struct udphdr;
 #      define skb_nfmark(skb) (((struct sk_buff *)(skb))->mark)
 #endif
 
+#ifdef CONFIG_NETWORK_SECMARK
+#      define skb_secmark(skb) ((skb)->secmark)
+#else
+#      define skb_secmark(skb) 0
+#endif
+
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 21)
 #      define ip_hdr(skb) ((skb)->nh.iph)
 #      define ip_hdrlen(skb) (ip_hdr(skb)->ihl * 4)

diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index 52b723b5b53cfaba3372c86f31e320e237b4b5f4..0284dfce9cee6cd9d4e87a1ea3b7833fd461050b 100644 (file)
--- a/extensions/compat_xtables.h
+++ b/extensions/compat_xtables.h
@@ -10,13 +10,13 @@
 #endif
 
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
-#      if !defined(CONFIG_NF_CONNTRACK_MARK) || !defined(CONFIG_NF_CONNTRACK_SECMARK)
-#              warning You have CONFIG_NF_CONNTRACK enabled, but CONFIG_NF_CONNTRACK_MARK or CONFIG_NF_CONNTRACK_SECMARK are not (please enable).
+#      if !defined(CONFIG_NF_CONNTRACK_MARK)
+#              warning You have CONFIG_NF_CONNTRACK enabled, but CONFIG_NF_CONNTRACK_MARK is not (please enable).
 #      endif
 #      include <net/netfilter/nf_conntrack.h>
 #elif defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)
-#      if !defined(CONFIG_IP_NF_CONNTRACK_MARK) || !defined(CONFIG_IP_NF_CONNTRACK_SECMARK)
-#              warning You have CONFIG_IP_NF_CONNTRACK enabled, but CONFIG_IP_NF_CONNTRACK_MARK or CONFIG_IP_NF_CONNTRACK_SECMARK are not (please enable).
+#      if !defined(CONFIG_IP_NF_CONNTRACK_MARK)
+#              warning You have CONFIG_IP_NF_CONNTRACK enabled, but CONFIG_IP_NF_CONNTRACK_MARK is not (please enable).
 #      endif
 #      include <linux/netfilter_ipv4/ip_conntrack.h>
 #      define nf_conn ip_conntrack

diff --git a/extensions/xt_LOGMARK.c b/extensions/xt_LOGMARK.c
index 3d2bf5edce3bcb53e8416ba1b1f637fcaad31f10..3e19b50028b74458d9c1f28fcf013aab0d44ff1e 100644 (file)
--- a/extensions/xt_LOGMARK.c
+++ b/extensions/xt_LOGMARK.c
@@ -42,7 +42,7 @@ logmark_tg(struct sk_buff *skb, const struct net_device *in,
        printk("<%u>%.*s""hook=%s nfmark=0x%x secmark=0x%x classify=0x%x",
               info->level, (unsigned int)sizeof(info->prefix), info->prefix,
               hook_names[hooknum],
-              skb_nfmark(skb), skb->secmark, skb->priority);
+              skb_nfmark(skb), skb_secmark(skb), skb->priority);
 
        ct = nf_ct_get(skb, &ctinfo);
        printk(" ctdir=%s", dir_names[ctinfo >= IP_CT_IS_REPLY]);