All of lore.kernel.org
 help / color / mirror / Atom feed
From: Max Kellermann <max@duempel.org>
To: netfilter-devel@lists.netfilter.org
Subject: [PATCH] 2.6.20-rc6-git2: error: 'struct nf_conn' has no member named 'mark'
Date: Wed, 31 Jan 2007 11:33:51 +0100	[thread overview]
Message-ID: <20070131103351.GA7248@roonstrasse.net> (raw)

[-- Attachment #1: Type: text/plain, Size: 409 bytes --]

Hi,

on 2.6.20-rc6-git2, compilation fails when CONFIG_NF_CONNTRACK_MARK is
not enabled:

  CC      net/netfilter/nf_conntrack_netlink.o
net/netfilter/nf_conntrack_netlink.c: In function
'ctnetlink_conntrack_event':
net/netfilter/nf_conntrack_netlink.c:392: error: 'struct nf_conn' has
no member named 'mark'
make[3]: *** [net/netfilter/nf_conntrack_netlink.o] Error 1

My patch adds the proper #ifdef.

Max


[-- Attachment #2: fix_nf_conn_mark_without_NF_CONNTRACK_MARK.patch --]
[-- Type: text/x-diff, Size: 523 bytes --]

--- net/netfilter/nf_conntrack_netlink.c.orig	2007-01-31 11:30:29.257592604 +0100
+++ net/netfilter/nf_conntrack_netlink.c	2007-01-31 11:30:49.226730581 +0100
@@ -389,9 +389,11 @@
 		    && ctnetlink_dump_helpinfo(skb, ct) < 0)
 		    	goto nfattr_failure;
 
+#ifdef CONFIG_NF_CONNTRACK_MARK
 		if ((events & IPCT_MARK || ct->mark)
 		    && ctnetlink_dump_mark(skb, ct) < 0)
 		    	goto nfattr_failure;
+#endif
 
 		if (events & IPCT_COUNTER_FILLING &&
 		    (ctnetlink_dump_counters(skb, ct, IP_CT_DIR_ORIGINAL) < 0 ||

             reply	other threads:[~2007-01-31 10:33 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-31 10:33 Max Kellermann [this message]
2007-02-02 13:38 ` [PATCH] 2.6.20-rc6-git2: error: 'struct nf_conn' has no member named 'mark' Patrick McHardy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070131103351.GA7248@roonstrasse.net \
    --to=max@duempel.org \
    --cc=netfilter-devel@lists.netfilter.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.