diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-12 01:54:08 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-13 00:08:47 +0100 |
| commit | 22bd5b9b13f2931ac80949f8bfbc40e8cab05be7 (patch) | |
| tree | d30639ce43efe3186461b0fff962f80eb2417c61 /net/ipv4/fib_rules.c | |
| parent | net: Add flowiX_to_flowi() shorthands. (diff) | |
| download | linux-22bd5b9b13f2931ac80949f8bfbc40e8cab05be7.tar.xz linux-22bd5b9b13f2931ac80949f8bfbc40e8cab05be7.zip | |
ipv4: Pass ipv4 flow objects into fib_lookup() paths.
To start doing these conversions, we need to add some temporary
flow4_* macros which will eventually go away when all the protocol
code paths are changed to work on AF specific flowi objects.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_rules.c')
| -rw-r--r-- | net/ipv4/fib_rules.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c index 3018efbaea77..0c63c4ab0936 100644 --- a/net/ipv4/fib_rules.c +++ b/net/ipv4/fib_rules.c @@ -53,7 +53,7 @@ u32 fib_rules_tclass(const struct fib_result *res) } #endif -int fib_lookup(struct net *net, struct flowi *flp, struct fib_result *res) +int fib_lookup(struct net *net, struct flowi4 *flp, struct fib_result *res) { struct fib_lookup_arg arg = { .result = res, @@ -61,7 +61,7 @@ int fib_lookup(struct net *net, struct flowi *flp, struct fib_result *res) }; int err; - err = fib_rules_lookup(net->ipv4.rules_ops, flp, 0, &arg); + err = fib_rules_lookup(net->ipv4.rules_ops, flowi4_to_flowi(flp), 0, &arg); res->r = arg.rule; return err; @@ -95,7 +95,7 @@ static int fib4_rule_action(struct fib_rule *rule, struct flowi *flp, if (!tbl) goto errout; - err = fib_table_lookup(tbl, flp, (struct fib_result *) arg->result, arg->flags); + err = fib_table_lookup(tbl, &flp->u.ip4, (struct fib_result *) arg->result, arg->flags); if (err > 0) err = -EAGAIN; errout: |