From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 2/6] netfilter: nft_meta: fix typo "CONFIG_NET_CLS_ROUTE"
Date: Wed, 19 Feb 2014 12:41:38 +0100 [thread overview]
Message-ID: <1392810102-13877-3-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1392810102-13877-1-git-send-email-pablo@netfilter.org>
From: Paul Bolle <pebolle@tiscali.nl>
There are two checks for CONFIG_NET_CLS_ROUTE, but the corresponding
Kconfig symbol was dropped in v2.6.39. Since the code guards access to
dst_entry.tclassid it seems CONFIG_IP_ROUTE_CLASSID should be used
instead.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nft_meta.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c
index e8254ad..425cf39 100644
--- a/net/netfilter/nft_meta.c
+++ b/net/netfilter/nft_meta.c
@@ -116,7 +116,7 @@ static void nft_meta_get_eval(const struct nft_expr *expr,
skb->sk->sk_socket->file->f_cred->fsgid);
read_unlock_bh(&skb->sk->sk_callback_lock);
break;
-#ifdef CONFIG_NET_CLS_ROUTE
+#ifdef CONFIG_IP_ROUTE_CLASSID
case NFT_META_RTCLASSID: {
const struct dst_entry *dst = skb_dst(skb);
@@ -199,7 +199,7 @@ static int nft_meta_init_validate_get(uint32_t key)
case NFT_META_OIFTYPE:
case NFT_META_SKUID:
case NFT_META_SKGID:
-#ifdef CONFIG_NET_CLS_ROUTE
+#ifdef CONFIG_IP_ROUTE_CLASSID
case NFT_META_RTCLASSID:
#endif
#ifdef CONFIG_NETWORK_SECMARK
--
1.7.10.4
next prev parent reply other threads:[~2014-02-19 11:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-19 11:41 [PATCH 0/6] Netfilter fixes for net Pablo Neira Ayuso
2014-02-19 11:41 ` [PATCH 1/6] netfilter: nft_reject_inet: fix unintended fall-through in switch-statatement Pablo Neira Ayuso
2014-02-19 11:41 ` Pablo Neira Ayuso [this message]
2014-02-19 11:41 ` [PATCH 3/6] netfilter: nf_nat_snmp_basic: fix duplicates in if/else branches Pablo Neira Ayuso
2014-02-19 11:41 ` [PATCH 4/6] netfilter: nf_tables: fix nf_trace always-on with XT_TRACE=n Pablo Neira Ayuso
2014-02-19 11:41 ` [PATCH 5/6] netfilter: nf_tables: check if payload length is a power of 2 Pablo Neira Ayuso
2014-02-19 11:41 ` [PATCH 6/6] netfilter: ctnetlink: force null nat binding on insert Pablo Neira Ayuso
2014-02-19 18:16 ` [PATCH 0/6] Netfilter fixes for net David Miller
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=1392810102-13877-3-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).