diff options
| author | David S. Miller <davem@davemloft.net> | 2013-09-30 23:11:00 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-30 23:24:57 +0400 |
| commit | 7b77d161ce7e480a660692cab079712fc0268ba2 (patch) | |
| tree | b48e40d0e619a1c1a82be374fbd458584a9d6094 /include/net/xfrm.h | |
| parent | 44a504c74ad338ccbbb9003f378d56576bdbf785 (diff) | |
| parent | aba8269588301f7778bea811d6f7ec74c2e37279 (diff) | |
| download | linux-7b77d161ce7e480a660692cab079712fc0268ba2.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Conflicts:
include/net/xfrm.h
Simple conflict between Joe Perches "extern" removal for function
declarations in header files and the changes in Steffen's tree.
Steffen Klassert says:
====================
Two patches that are left from the last development cycle.
Manual merging of include/net/xfrm.h is needed. The conflict
can be solved as it is currently done in linux-next.
1) We announce the creation of temporary acquire state via an asyc event,
so the deletion should be annunced too. From Nicolas Dichtel.
2) The VTI tunnels do not real tunning, they just provide a routable
IPsec tunnel interface. So introduce and use xfrm_tunnel_notifier
instead of xfrm_tunnel for xfrm tunnel mode callback. From Fan Du.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/xfrm.h')
| -rw-r--r-- | include/net/xfrm.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 765746192724..b8a9ed849801 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1357,6 +1357,12 @@ struct xfrm_tunnel { int priority; }; +struct xfrm_tunnel_notifier { + int (*handler)(struct sk_buff *skb); + struct xfrm_tunnel_notifier __rcu *next; + int priority; +}; + struct xfrm6_tunnel { int (*handler)(struct sk_buff *skb); int (*err_handler)(struct sk_buff *skb, struct inet6_skb_parm *opt, @@ -1499,9 +1505,9 @@ int xfrm4_output(struct sk_buff *skb); int xfrm4_output_finish(struct sk_buff *skb); int xfrm4_tunnel_register(struct xfrm_tunnel *handler, unsigned short family); int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler, unsigned short family); -int xfrm4_mode_tunnel_input_register(struct xfrm_tunnel *handler); -int xfrm4_mode_tunnel_input_deregister(struct xfrm_tunnel *handler); void xfrm4_local_error(struct sk_buff *skb, u32 mtu); +int xfrm4_mode_tunnel_input_register(struct xfrm_tunnel_notifier *handler); +int xfrm4_mode_tunnel_input_deregister(struct xfrm_tunnel_notifier *handler); int xfrm6_extract_header(struct sk_buff *skb); int xfrm6_extract_input(struct xfrm_state *x, struct sk_buff *skb); int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi); @@ -1509,9 +1515,9 @@ int xfrm6_transport_finish(struct sk_buff *skb, int async); int xfrm6_rcv(struct sk_buff *skb); int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr, xfrm_address_t *saddr, u8 proto); +void xfrm6_local_error(struct sk_buff *skb, u32 mtu); int xfrm6_tunnel_register(struct xfrm6_tunnel *handler, unsigned short family); -int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler, - unsigned short family); +int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler, unsigned short family); __be32 xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr); __be32 xfrm6_tunnel_spi_lookup(struct net *net, const xfrm_address_t *saddr); int xfrm6_extract_output(struct xfrm_state *x, struct sk_buff *skb); @@ -1520,7 +1526,6 @@ int xfrm6_output(struct sk_buff *skb); int xfrm6_output_finish(struct sk_buff *skb); int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb, u8 **prevhdr); -void xfrm6_local_error(struct sk_buff *skb, u32 mtu); #ifdef CONFIG_XFRM int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb); |