 a8c5f90fb5
			
		
	
	
	a8c5f90fb5
	
	
	
		
			
			Instead of calling fou and gue functions directly from ip_tunnel use ops for these that were previously registered. This patch adds the logic to add and remove encapsulation operations for ip_tunnel, and modified fou (and gue) to register with ip_tunnels. This patch also addresses a circular dependency between ip_tunnel and fou that was causing link errors when CONFIG_NET_IP_TUNNEL=y and CONFIG_NET_FOU=m. References to fou an gue have been removed from ip_tunnel.c Reported-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Tom Herbert <therbert@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
		
			
				
	
	
		
			19 lines
		
	
	
	
		
			499 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			19 lines
		
	
	
	
		
			499 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
| #ifndef __NET_FOU_H
 | |
| #define __NET_FOU_H
 | |
| 
 | |
| #include <linux/skbuff.h>
 | |
| 
 | |
| #include <net/flow.h>
 | |
| #include <net/gue.h>
 | |
| #include <net/ip_tunnels.h>
 | |
| #include <net/udp.h>
 | |
| 
 | |
| size_t fou_encap_hlen(struct ip_tunnel_encap *e);
 | |
| static size_t gue_encap_hlen(struct ip_tunnel_encap *e);
 | |
| 
 | |
| int fou_build_header(struct sk_buff *skb, struct ip_tunnel_encap *e,
 | |
| 		     u8 *protocol, struct flowi4 *fl4);
 | |
| int gue_build_header(struct sk_buff *skb, struct ip_tunnel_encap *e,
 | |
| 		     u8 *protocol, struct flowi4 *fl4);
 | |
| 
 | |
| #endif
 |