xfrm: remove tos indirection from afinfo_policy

Only used by ipv4, we can read the fl4 tos value directly instead.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

1 files changed, 3 insertions, 11 deletions

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 16e70fc547b1..1d1335eab76c 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2450,18 +2450,10 @@ xfrm_tmpl_resolve(struct xfrm_policy **pols, int npols, const struct flowi *fl,
 
 static int xfrm_get_tos(const struct flowi *fl, int family)
 {
-        const struct xfrm_policy_afinfo *afinfo;
-        int tos;
-
-        afinfo = xfrm_policy_get_afinfo(family);
-        if (!afinfo)
-                return 0;
-
-        tos = afinfo->get_tos(fl);
+        if (family == AF_INET)
+                return IPTOS_RT_MASK & fl->u.ip4.flowi4_tos;
 
-        rcu_read_unlock();
-
-        return tos;
+        return 0;
 }
 
 static inline struct xfrm_dst *xfrm_alloc_dst(struct net *net, int family)