ipv4: Use flowi4 in FIB layer.

[karo-tx-linux.git] / net / ipv4 / fib_rules.c

diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index 0c63c4ab09366ce7a53d3f1f18a2cc79673badc1..a53bb1b5b11825a5663629047cff9ec0509d31e6 100644 (file)
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -106,14 +106,15 @@ errout:
 static int fib4_rule_match(struct fib_rule *rule, struct flowi *fl, int flags)
 {
        struct fib4_rule *r = (struct fib4_rule *) rule;
-       __be32 daddr = fl->fl4_dst;
-       __be32 saddr = fl->fl4_src;
+       struct flowi4 *fl4 = &fl->u.ip4;
+       __be32 daddr = fl4->daddr;
+       __be32 saddr = fl4->saddr;
 
        if (((saddr ^ r->src) & r->srcmask) ||
            ((daddr ^ r->dst) & r->dstmask))
                return 0;
 
-       if (r->tos && (r->tos != fl->fl4_tos))
+       if (r->tos && (r->tos != fl4->flowi4_tos))
                return 0;
 
        return 1;