Merge branch 'ovs-v6-build-err'

Joe Stringer says:

====================
OPENVSWITCH && !NETFILTER build fix.

Fix issues reported by kbuild test robot:

All error/warnings (new ones prefixed by >>):

   net/openvswitch/actions.c: In function 'ovs_fragment':
>> net/openvswitch/actions.c:705:16: error: implicit declaration of
function 'nf_get_ipv6_ops' [-Werror=implicit-function-declaration]
      const struct nf_ipv6_ops *v6ops = nf_get_ipv6_ops();
                   ^
>> net/openvswitch/actions.c:705:37: warning: initialization makes
pointer from integer without a cast
      const struct nf_ipv6_ops *v6ops = nf_get_ipv6_ops();
                                        ^
>> net/openvswitch/actions.c:707:19: error: storage size of 'ovs_rt'
isn't known
      struct rt6_info ovs_rt;
                      ^
>> net/openvswitch/actions.c:724:8: error: dereferencing pointer to
incomplete type
      v6ops->fragment(skb->sk, skb, ovs_vport_output);
           ^
>> net/openvswitch/actions.c:707:19: warning: unused variable 'ovs_rt'
[-Wunused-variable]
      struct rt6_info ovs_rt;
                      ^
   cc1: some warnings being treated as errors
====================
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

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*/

net/openvswitch/actions.c

@@ -33,6 +33,7 @@
 #include <net/dst.h>
 #include <net/ip.h>
 #include <net/ipv6.h>
+#include <net/ip6_fib.h>
 #include <net/checksum.h>
 #include <net/dsfield.h>
 #include <net/mpls.h>