netfilter: ipv4: Convert ip_route_me_harder() to dscp_t.

Use ip4h_dscp()instead of reading iph->tos directly.

ip4h_dscp() returns a dscp_t value which is temporarily converted back
to __u8 with inet_dscp_to_dsfield(). When converting ->flowi4_tos to
dscp_t in the future, we'll only have to remove that
inet_dscp_to_dsfield() call.

Signed-off-by: Guillaume Nault <gnault@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
index e0aab66cd92511c921c08a9319a20c19e477a716..08bc3f2c0078bbc956f45daab605b287efbd4819 100644 (file)
--- a/net/ipv4/netfilter.c
+++ b/net/ipv4/netfilter.c
@@ -44,7 +44,7 @@ int ip_route_me_harder(struct net *net, struct sock *sk, struct sk_buff *skb, un
         */
        fl4.daddr = iph->daddr;
        fl4.saddr = saddr;
-       fl4.flowi4_tos = iph->tos & INET_DSCP_MASK;
+       fl4.flowi4_tos = inet_dscp_to_dsfield(ip4h_dscp(iph));
        fl4.flowi4_oif = sk ? sk->sk_bound_dev_if : 0;
        fl4.flowi4_l3mdev = l3mdev_master_ifindex(dev);
        fl4.flowi4_mark = skb->mark;