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 /net/ipv4/xfrm4_state.c | |
| parent | xfrm: remove state and template sort indirections from xfrm_state_afinfo (diff) | |
| download | linux-dev-4c203b0454b5b6bfafe2c4ab1b5472d4a7a8a0f2.tar.xz linux-dev-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 'net/ipv4/xfrm4_state.c')
| -rw-r--r-- | net/ipv4/xfrm4_state.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c index 62c96da38b4e..f8ed3c3bb928 100644 --- a/net/ipv4/xfrm4_state.c +++ b/net/ipv4/xfrm4_state.c @@ -34,8 +34,6 @@ int xfrm4_extract_header(struct sk_buff *skb) static struct xfrm_state_afinfo xfrm4_state_afinfo = { .family = AF_INET, .proto = IPPROTO_IPIP, - .eth_proto = htons(ETH_P_IP), - .owner = THIS_MODULE, .output = xfrm4_output, .output_finish = xfrm4_output_finish, .extract_input = xfrm4_extract_input, |