diff options
| author | Florian Westphal <fw@strlen.de> | 2019-05-03 17:46:18 +0200 |
|---|---|---|
| committer | Steffen Klassert <steffen.klassert@secunet.com> | 2019-06-06 08:34:50 +0200 |
| commit | 4c203b0454b5b6bfafe2c4ab1b5472d4a7a8a0f2 (patch) | |
| tree | 96cd1a45372a6602c24216c696d6c5b32658fa9b /include/net/xfrm.h | |
| parent | 3aaf3915a31aac83523d2de0191a480d3ad1e747 (diff) | |
| download | linux-4c203b0454b5b6bfafe2c4ab1b5472d4a7a8a0f2.tar.gz linux-4c203b0454b5b6bfafe2c4ab1b5472d4a7a8a0f2.tar.bz2 linux-4c203b0454b5b6bfafe2c4ab1b5472d4a7a8a0f2.zip | |
xfrm: remove eth_proto value from xfrm_state_afinfo
xfrm_prepare_input needs to lookup the state afinfo backend again to fetch
the address family ethernet protocol value.
There are only two address families, so a switch statement is simpler.
While at it, use u8 for family and proto and remove the owner member --
its not used anywhere.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'include/net/xfrm.h')
| -rw-r--r-- | include/net/xfrm.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 4325cb708ed4..812994ad49ac 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -346,10 +346,8 @@ void km_state_expired(struct xfrm_state *x, int hard, u32 portid); int __xfrm_state_delete(struct xfrm_state *x); struct xfrm_state_afinfo { - unsigned int family; - unsigned int proto; - __be16 eth_proto; - struct module *owner; + u8 family; + u8 proto; const struct xfrm_type *type_map[IPPROTO_MAX]; const struct xfrm_type_offload *type_offload_map[IPPROTO_MAX]; |