This change removes the tunnel parameter from xfrm6_rcv_spi and deletes xfrm6_rcv_tnl. These were only used by the VTI code and are now unused.
Tested: https://android-review.googlesource.com/571524 Signed-off-by: Lorenzo Colitti <lore...@google.com> --- include/net/xfrm.h | 4 +--- net/ipv6/ip6_vti.c | 2 +- net/ipv6/xfrm6_input.c | 13 +++---------- net/ipv6/xfrm6_tunnel.c | 2 +- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 3d245f2f6f..fc19dda73c 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1638,10 +1638,8 @@ int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler, unsigned short family); void xfrm4_local_error(struct sk_buff *skb, u32 mtu); 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, - struct ip6_tnl *t); +int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi); int xfrm6_transport_finish(struct sk_buff *skb, int async); -int xfrm6_rcv_tnl(struct sk_buff *skb, struct ip6_tnl *t); 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); diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index 18c2695dc3..2ac0bfff0f 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -401,7 +401,7 @@ static int vti6_rcv(struct sk_buff *skb) int nexthdr = skb_network_header(skb)[IP6CB(skb)->nhoff]; XFRM_TUNNEL_SKB_CB(skb)->tunnel.lookup = vti6_lookup; - return xfrm6_rcv_spi(skb, nexthdr, 0, NULL); + return xfrm6_rcv_spi(skb, nexthdr, 0); } static int vti6_rcv_cb(struct sk_buff *skb, int err) diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c index 6d1b734fef..5f20e30926 100644 --- a/net/ipv6/xfrm6_input.c +++ b/net/ipv6/xfrm6_input.c @@ -22,8 +22,7 @@ int xfrm6_extract_input(struct xfrm_state *x, struct sk_buff *skb) return xfrm6_extract_header(skb); } -int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi, - struct ip6_tnl *t) +int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi) { XFRM_SPI_SKB_CB(skb)->family = AF_INET6; XFRM_SPI_SKB_CB(skb)->daddroff = offsetof(struct ipv6hdr, daddr); @@ -59,16 +58,10 @@ int xfrm6_transport_finish(struct sk_buff *skb, int async) return -1; } -int xfrm6_rcv_tnl(struct sk_buff *skb, struct ip6_tnl *t) -{ - return xfrm6_rcv_spi(skb, skb_network_header(skb)[IP6CB(skb)->nhoff], - 0, t); -} -EXPORT_SYMBOL(xfrm6_rcv_tnl); - int xfrm6_rcv(struct sk_buff *skb) { - return xfrm6_rcv_tnl(skb, NULL); + return xfrm6_rcv_spi(skb, skb_network_header(skb)[IP6CB(skb)->nhoff], + 0); } EXPORT_SYMBOL(xfrm6_rcv); int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr, diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index f85f0d7480..02161543a9 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c @@ -236,7 +236,7 @@ static int xfrm6_tunnel_rcv(struct sk_buff *skb) __be32 spi; spi = xfrm6_tunnel_spi_lookup(net, (const xfrm_address_t *)&iph->saddr); - return xfrm6_rcv_spi(skb, IPPROTO_IPV6, spi, NULL); + return xfrm6_rcv_spi(skb, IPPROTO_IPV6, spi); } static int xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt, -- 2.15.1.620.gb9897f4670-goog
