From 48f737451a0a40b8e36ebdb95ada59c2ec3b4f4f Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 19 Jun 2012 05:25:46 +0200 Subject: [PATCH] --- yaml --- r: 314320 b: refs/heads/master c: 674147e21195a496164e1c7ff70d0f0b45235f25 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/netfilter/nfnetlink_queue.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2dab3b8a58f2..5576d41235c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bdc5f49e365a5403b9fdef01ceb37241ab00f9b +refs/heads/master: 674147e21195a496164e1c7ff70d0f0b45235f25 diff --git a/trunk/include/net/netfilter/nfnetlink_queue.h b/trunk/include/net/netfilter/nfnetlink_queue.h index 9f8095c108e4..86267a529514 100644 --- a/trunk/include/net/netfilter/nfnetlink_queue.h +++ b/trunk/include/net/netfilter/nfnetlink_queue.h @@ -5,7 +5,7 @@ struct nf_conn; -#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) +#ifdef CONFIG_NETFILTER_NETLINK_QUEUE_CT struct nf_conn *nfqnl_ct_get(struct sk_buff *entskb, size_t *size, enum ip_conntrack_info *ctinfo); struct nf_conn *nfqnl_ct_parse(const struct sk_buff *skb,