Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06efbd6d authored by Paul Bolle's avatar Paul Bolle Committed by Pablo Neira Ayuso
Browse files

netfilter: nft_meta: fix typo "CONFIG_NET_CLS_ROUTE" 



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: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent ce898ecb

net/netfilter/nft_meta.c

+2 −2
Original line number Diff line number Diff line
@@ -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