Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e4cfae2 authored by Joe Stringer's avatar Joe Stringer Committed by David S. Miller
Browse files

netfilter: Define v6ops in !CONFIG_NETFILTER case. 



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: 7f8a436e "openvswitch: Add conntrack action"
Signed-off-by: default avatarJoe Stringer <joestringer@nicira.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c4d3e224

include/linux/netfilter_ipv6.h

+9 −9
Original line number Diff line number Diff line
@@ -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*/