iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfrm: remove hdr_offset indirection

Browse Source 
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: Florian Westphal <fw@strlen.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
This commit is contained in:
Florian Westphal 2021-06-11 12:50:13 +02:00 committed by Steffen Klassert
parent 848b18fb7f
commit d1002d2490
6 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/xfrm.h
View File

@ -402,7 +402,6 @@ struct xfrm_type {
int (*output)(struct xfrm_state *, struct sk_buff *pskb); int (*output)(struct xfrm_state *, struct sk_buff *pskb);
int (*reject)(struct xfrm_state *, struct sk_buff *, int (*reject)(struct xfrm_state *, struct sk_buff *,
const struct flowi *); 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); 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); __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(struct net *net, struct sock *sk, struct sk_buff *skb);
int xfrm6_output_finish(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 #ifdef CONFIG_XFRM
void xfrm6_local_rxpmtu(struct sk_buff *skb, u32 mtu); void xfrm6_local_rxpmtu(struct sk_buff *skb, u32 mtu);

1
net/ipv6/ah6.c
View File

@ -762,7 +762,6 @@ static const struct xfrm_type ah6_type = {
.destructor = ah6_destroy, .destructor = ah6_destroy,
.input = ah6_input, .input = ah6_input,
.output = ah6_output, .output = ah6_output,
.hdr_offset = xfrm6_find_1stfragopt,
}; };
static struct xfrm6_protocol ah6_protocol = { static struct xfrm6_protocol ah6_protocol = {

1
net/ipv6/esp6.c
View File

@ -1250,7 +1250,6 @@ static const struct xfrm_type esp6_type = {
.destructor = esp6_destroy, .destructor = esp6_destroy,
.input = esp6_input, .input = esp6_input,
.output = esp6_output, .output = esp6_output,
.hdr_offset = xfrm6_find_1stfragopt,
}; };
static struct xfrm6_protocol esp6_protocol = { static struct xfrm6_protocol esp6_protocol = {

1
net/ipv6/ipcomp6.c
View File

@ -178,7 +178,6 @@ static const struct xfrm_type ipcomp6_type = {
.destructor = ipcomp_destroy, .destructor = ipcomp_destroy,
.input = ipcomp_input, .input = ipcomp_input,
.output = ipcomp_output, .output = ipcomp_output,
.hdr_offset = xfrm6_find_1stfragopt,
}; };
static struct xfrm6_protocol ipcomp6_protocol = { static struct xfrm6_protocol ipcomp6_protocol = {

7
net/ipv6/xfrm6_output.c
View File

@ -16,13 +16,6 @@
#include <net/ip6_route.h> #include <net/ip6_route.h>
#include <net/xfrm.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) void xfrm6_local_rxpmtu(struct sk_buff *skb, u32 mtu)
{ {
struct flowi6 fl6; struct flowi6 fl6;

2
net/xfrm/xfrm_output.c
View File

@ -185,7 +185,7 @@ static int xfrm6_hdr_offset(struct xfrm_state *x, struct sk_buff *skb, u8 **prev
break; break;
} }
return x->type->hdr_offset(x, skb, prevhdr); return ip6_find_1stfragopt(skb, prevhdr);
} }
/* Add encapsulation header. /* Add encapsulation header.