diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-03 22:55:21 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-03 22:55:21 +0000 |
commit | 04228460a3ded723b2da09141c76c45ddd712caf (patch) | |
tree | db7b9143b150ead1e9fec10760a1d5ff4045a5e7 /net/core/fib_rules.c | |
parent | 7c0ab43e6ab09d72dc8dbac2521b2f819ccc4026 (diff) | |
parent | 24c78557741395e038e83f25367cf2bfd7f582b8 (diff) |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'net/core/fib_rules.c')
-rw-r--r-- | net/core/fib_rules.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index 82a4369ae15..a20e5d3bbfa 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -181,8 +181,7 @@ static int fib_rule_match(struct fib_rule *rule, struct fib_rules_ops *ops, { int ret = 0; - if (rule->iifindex && (rule->iifindex != fl->iif) && - !(fl->flags & FLOWI_FLAG_MATCH_ANY_IIF)) + if (rule->iifindex && (rule->iifindex != fl->iif)) goto out; if (rule->oifindex && (rule->oifindex != fl->oif)) |