[PATCH nf-next] fixup! netfilter: nft: add support for native socket matching

[Máté Eckl]

Signed-off-by: Máté Eckl <eckl...@gmail.com>
---
 net/netfilter/nft_socket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/netfilter/nft_socket.c b/net/netfilter/nft_socket.c
index 5eb1069ac338..dd389b37334a 100644
--- a/net/netfilter/nft_socket.c
+++ b/net/netfilter/nft_socket.c
@@ -28,7 +28,7 @@ static void nft_socket_eval(const struct nft_expr *expr,
                case NFPROTO_IPV4:
                        sk = nf_sk_lookup_slow_v4(nft_net(pkt), skb, 
nft_in(pkt));
                        break;
-#ifdef CONFIG_NF_SOCKET_IPV6
+#if IS_ENABLED(CONFIG_NF_SOCKET_IPV6)
                case NFPROTO_IPV6:
                        sk = nf_sk_lookup_slow_v6(nft_net(pkt), skb, 
nft_in(pkt));
                        break;
@@ -73,7 +73,7 @@ static int nft_socket_init(const struct nft_ctx *ctx,
 
        switch(ctx->family) {
        case NFPROTO_IPV4:
-#ifdef CONFIG_NF_SOCKET_IPV6
+#if IS_ENABLED(CONFIG_NF_SOCKET_IPV6)
        case NFPROTO_IPV6:
 #endif
        case NFPROTO_INET:
-- 
ecklm

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html