Merge tag 'powerpc-4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[firefly-linux-kernel-4.4.55.git] / net / netfilter / nft_meta.c

diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c
index 52561e1c31e26933dd654f095663c0f0a633f007..cb2f13ebb5a66cdf5fd9498ddfe8949f38741803 100644 (file)
--- a/net/netfilter/nft_meta.c
+++ b/net/netfilter/nft_meta.c
@@ -166,11 +166,13 @@ void nft_meta_get_eval(const struct nft_expr *expr,
                        goto err;
                *dest = out->group;
                break;
+#ifdef CONFIG_CGROUP_NET_CLASSID
        case NFT_META_CGROUP:
                if (skb->sk == NULL || !sk_fullsock(skb->sk))
                        goto err;
                *dest = skb->sk->sk_classid;
                break;
+#endif
        default:
                WARN_ON(1);
                goto err;
@@ -246,7 +248,9 @@ int nft_meta_get_init(const struct nft_ctx *ctx,
        case NFT_META_CPU:
        case NFT_META_IIFGROUP:
        case NFT_META_OIFGROUP:
+#ifdef CONFIG_CGROUP_NET_CLASSID
        case NFT_META_CGROUP:
+#endif
                len = sizeof(u32);
                break;
        case NFT_META_IIFNAME: