redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

xfrm: prefer family stored in xfrm_mode struct 

Now that we have the family available directly in the
xfrm_mode struct, we can use that and avoid one extra dereference.

Signed-off-by: Florian Westphal <fw@strlen.de>
Reviewed-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
hifive-unleashed-5.2
Florian Westphal 2019-03-29 21:16:23 +01:00 committed by Steffen Klassert
parent b262a69582
commit b45714b164
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/ip_vti.c
View File

@ -137,7 +137,7 @@ static int vti_rcv_cb(struct sk_buff *skb, int err)
}
}
family = inner_mode->afinfo->family;
family = inner_mode->family;
skb->mark = be32_to_cpu(tunnel->parms.i_key);
ret = xfrm_policy_check(NULL, XFRM_POLICY_IN, skb, family);

2
net/ipv6/ip6_vti.c
View File

@ -372,7 +372,7 @@ static int vti6_rcv_cb(struct sk_buff *skb, int err)
}
}
family = inner_mode->afinfo->family;
family = inner_mode->family;
skb->mark = be32_to_cpu(t->parms.i_key);
ret = xfrm_policy_check(NULL, XFRM_POLICY_IN, skb, family);

4
net/xfrm/xfrm_input.c
View File

@ -216,7 +216,7 @@ int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type)
goto drop;
}
family = x->outer_mode->afinfo->family;
family = x->outer_mode->family;
/* An encap_type of -1 indicates async resumption. */
if (encap_type == -1) {
@ -425,7 +425,7 @@ resume:
* transport mode so the outer address is identical.
*/
daddr = &x->id.daddr;
family = x->outer_mode->afinfo->family;
family = x->outer_mode->family;
err = xfrm_parse_spi(skb, nexthdr, &spi, &seq);
if (err < 0) {

2
net/xfrm/xfrm_interface.c
View File

@ -285,7 +285,7 @@ static int xfrmi_rcv_cb(struct sk_buff *skb, int err)
}
if (!xfrm_policy_check(NULL, XFRM_POLICY_IN, skb,
inner_mode->afinfo->family))
inner_mode->family))
return -EPERM;
}