xfrm: Convert xfrm_bundle_create() to dscp_t.

Use a dscp_t variable to store the result of xfrm_get_dscp().
This prepares for the future conversion of xfrm_dst_lookup().

Signed-off-by: Guillaume Nault <gnault@redhat.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 51a071a790164a18232d021649bf679f3ac1afdc..ecb989347bd457f1028882009c10eb7129012ef3 100644 (file)
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2678,13 +2678,13 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy,
        int header_len = 0;
        int nfheader_len = 0;
        int trailer_len = 0;
-       int tos;
        int family = policy->selector.family;
        xfrm_address_t saddr, daddr;
+       dscp_t dscp;
 
        xfrm_flowi_addr_get(fl, &saddr, &daddr, family);
 
-       tos = inet_dscp_to_dsfield(xfrm_get_dscp(fl, family));
+       dscp = xfrm_get_dscp(fl, family);
 
        dst_hold(dst);
 
@@ -2732,7 +2732,8 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy,
                                family = xfrm[i]->props.family;
 
                        oif = fl->flowi_oif ? : fl->flowi_l3mdev;
-                       dst = xfrm_dst_lookup(xfrm[i], tos, oif,
+                       dst = xfrm_dst_lookup(xfrm[i],
+                                             inet_dscp_to_dsfield(dscp), oif,
                                              &saddr, &daddr, family, mark);
                        err = PTR_ERR(dst);
                        if (IS_ERR(dst))