OSDN Git Service

ip_tunnel: Ops registration for secondary encap (fou, gue)
authorTom Herbert <therbert@google.com>
Wed, 12 Nov 2014 19:54:09 +0000 (11:54 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 12 Nov 2014 20:01:35 +0000 (15:01 -0500)
commita8c5f90fb59a2d3bff0bd29adbb3e39fe0dd52f8
tree49171c0ba2df50c16595901743dad7c0d32a7c33
parent4243cdc2c1e5a1375cc8397e8f9b06530f099c60
ip_tunnel: Ops registration for secondary encap (fou, gue)

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>
include/net/fou.h
include/net/ip_tunnels.h
net/ipv4/fou.c
net/ipv4/ip_tunnel.c