[PATCH net-next 1/2] netfilter: Define v6ops in !CONFIG_NETFILTER case.

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Joe Stringer <joestringer@nicira.com>
Newsgroups	linux.kernel
Subject	[PATCH net-next 1/2] netfilter: Define v6ops in !CONFIG_NETFILTER case.
Date	Fri, 28 Aug 2015 00:40:05 +0200
Message-ID	<q2dZX-1aQ-87@gated-at.bofh.it> (permalink)
References	<q2dZU-1aQ-25@gated-at.bofh.it>
X-Original-To	netdev@vger.kernel.org, davem@davemloft.net
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4kusFrz3qULQoPMi18PDvNPplGPjflMKDClivBjlJIE=; b=YcObM9x7gq5iX6bLYWLoyjz2RnsOMYDC9ver/zdbBz8bodZzfLttaNm599becHOA0f DDZY20rv90eHnCIQSvQH4q69vg6vnbVH9oimxp/gY60qnp/bjV+RwYv8TUSbdmADWtn3 WJF0qNrP5Z0gxzHWdJIbBhhuWGpWIQzSYwSUME4h3WJrWZQGe8xsSm1UWQx2aR4dm1Lk lIjPqDU0HxDInwrERwOLrwxjaOMm0qBWcWNGFJgz8DT1nKmn7Pdgx9GmkpL5T4hFMU1W zB/wXZhc1RZjbS6Z8HUR5wgU/JAz3uY6dBWQkGJ5CoYYNDN6P/5jGQjDcH3d8VMQk2Wa Ul+w==
X-Gm-Message-State	ALoCoQmZ/aUocnMwBLFW1AMei9v0cRlA07eYkcGBbAmU9max84qhxJPrxcBYuBNoUZb0W0rLiRkQ
X-Received	by 10.68.243.103 with SMTP id wx7mr9994529pbc.60.1440714695319; Thu, 27 Aug 2015 15:31:35 -0700 (PDT)
X-Mailer	git-send-email 2.1.4
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	61
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org, pshelar@nicira.com, pablo@netfilter.org
X-Original-Date	Thu, 27 Aug 2015 15:25:45 -0700
X-Original-Message-ID	<1440714346-43304-2-git-send-email-joestringer@nicira.com>
X-Original-References	<1440714346-43304-1-git-send-email-joestringer@nicira.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1214944

Show key headers only | View raw

When CONFIG_OPENVSWITCH is set, and CONFIG_NETFILTER is not set, the
openvswitch IPv6 fragmentation handling cannot refer to ipv6_ops because
it isn't defined. Add a dummy version to avoid #ifdefs in source files.

Fixes: 7f8a436 "openvswitch: Add conntrack action"
Signed-off-by: Joe Stringer <joestringer@nicira.com>
---
 include/linux/netfilter_ipv6.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h
index 8b7d28f..7715746 100644
--- a/include/linux/netfilter_ipv6.h
+++ b/include/linux/netfilter_ipv6.h
@@ -9,15 +9,6 @@
 
 #include <uapi/linux/netfilter_ipv6.h>
 
-
-#ifdef CONFIG_NETFILTER
-int ip6_route_me_harder(struct sk_buff *skb);
-__sum16 nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,
-			unsigned int dataoff, u_int8_t protocol);
-
-int ipv6_netfilter_init(void);
-void ipv6_netfilter_fini(void);
-
 /*
  * Hook functions for ipv6 to allow xt_* modules to be built-in even
  * if IPv6 is a module.
@@ -30,6 +21,14 @@ struct nf_ipv6_ops {
 			int (*output)(struct sock *, struct sk_buff *));
 };
 
+#ifdef CONFIG_NETFILTER
+int ip6_route_me_harder(struct sk_buff *skb);
+__sum16 nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,
+			unsigned int dataoff, u_int8_t protocol);
+
+int ipv6_netfilter_init(void);
+void ipv6_netfilter_fini(void);
+
 extern const struct nf_ipv6_ops __rcu *nf_ipv6_ops;
 static inline const struct nf_ipv6_ops *nf_get_ipv6_ops(void)
 {
@@ -39,6 +38,7 @@ static inline const struct nf_ipv6_ops *nf_get_ipv6_ops(void)
 #else /* CONFIG_NETFILTER */
 static inline int ipv6_netfilter_init(void) { return 0; }
 static inline void ipv6_netfilter_fini(void) { return; }
+static inline const struct nf_ipv6_ops *nf_get_ipv6_ops(void) { return NULL; }
 #endif /* CONFIG_NETFILTER */
 
 #endif /*__LINUX_IP6_NETFILTER_H*/
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Thread

[PATCH net-next 0/2] OPENVSWITCH && !NETFILTER build fix. Joe Stringer <joestringer@nicira.com> - 2015-08-28 00:40 +0200
  [PATCH net-next 1/2] netfilter: Define v6ops in !CONFIG_NETFILTER case. Joe Stringer <joestringer@nicira.com> - 2015-08-28 00:40 +0200
  Re: [PATCH net-next 0/2] OPENVSWITCH && !NETFILTER build fix. David Miller <davem@davemloft.net> - 2015-08-28 01:40 +0200

csiph-web