Commit d1002d24 authored by Florian Westphal's avatar Florian Westphal Committed by Steffen Klassert
Browse files

xfrm: remove hdr_offset indirection 



After previous patches all remaining users set the function pointer to
the same function: xfrm6_find_1stfragopt.

So remove this function pointer and call ip6_find_1stfragopt directly.

Reduces size of xfrm_type to 64 bytes on 64bit platforms.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 848b18fb

include/net/xfrm.h

+0 −3
Original line number Diff line number Diff line
@@ -402,7 +402,6 @@ struct xfrm_type { 
	int			(*output)(struct xfrm_state *, struct sk_buff *pskb);

	int			(*reject)(struct xfrm_state *, struct sk_buff *,

					  const struct flowi *);

	int			(*hdr_offset)(struct xfrm_state *, struct sk_buff *, u8 **);

};



int xfrm_register_type(const struct xfrm_type *type, unsigned short family);
@@ -1605,8 +1604,6 @@ __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_output(struct net *net, struct sock *sk, struct sk_buff *skb);

int xfrm6_output_finish(struct sock *sk, struct sk_buff *skb);

int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb,

			  u8 **prevhdr);



#ifdef CONFIG_XFRM

void xfrm6_local_rxpmtu(struct sk_buff *skb, u32 mtu);

net/ipv6/ah6.c

+0 −1
Original line number Diff line number Diff line
@@ -762,7 +762,6 @@ static const struct xfrm_type ah6_type = { 
	.destructor	= ah6_destroy,

	.input		= ah6_input,

	.output		= ah6_output,

	.hdr_offset	= xfrm6_find_1stfragopt,

};



static struct xfrm6_protocol ah6_protocol = {

net/ipv6/esp6.c

+0 −1
Original line number Diff line number Diff line
@@ -1250,7 +1250,6 @@ static const struct xfrm_type esp6_type = { 
	.destructor	= esp6_destroy,

	.input		= esp6_input,

	.output		= esp6_output,

	.hdr_offset	= xfrm6_find_1stfragopt,

};



static struct xfrm6_protocol esp6_protocol = {

net/ipv6/ipcomp6.c

+0 −1
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ static const struct xfrm_type ipcomp6_type = { 
	.destructor	= ipcomp_destroy,

	.input		= ipcomp_input,

	.output		= ipcomp_output,

	.hdr_offset	= xfrm6_find_1stfragopt,

};



static struct xfrm6_protocol ipcomp6_protocol = {

net/ipv6/xfrm6_output.c

+0 −7
Original line number Diff line number Diff line
@@ -16,13 +16,6 @@ 
#include <net/ip6_route.h>

#include <net/xfrm.h>



int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb,

			  u8 **prevhdr)

{

	return ip6_find_1stfragopt(skb, prevhdr);

}

EXPORT_SYMBOL(xfrm6_find_1stfragopt);



void xfrm6_local_rxpmtu(struct sk_buff *skb, u32 mtu)

{

	struct flowi6 fl6;