diff options
-rw-r--r-- | net/ipv4/fib_hash.c | 1 | ||||
-rw-r--r-- | net/ipv4/fib_lookup.h | 3 | ||||
-rw-r--r-- | net/ipv4/fib_semantics.c | 3 | ||||
-rw-r--r-- | net/ipv4/fib_trie.c | 3 |
4 files changed, 3 insertions, 7 deletions
diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c index ded8c44fb848..ecd39454235c 100644 --- a/net/ipv4/fib_hash.c +++ b/net/ipv4/fib_hash.c | |||
@@ -263,7 +263,6 @@ fn_hash_lookup(struct fib_table *tb, const struct flowi *flp, struct fib_result | |||
263 | 263 | ||
264 | err = fib_semantic_match(&f->fn_alias, | 264 | err = fib_semantic_match(&f->fn_alias, |
265 | flp, res, | 265 | flp, res, |
266 | f->fn_key, fz->fz_mask, | ||
267 | fz->fz_order); | 266 | fz->fz_order); |
268 | if (err <= 0) | 267 | if (err <= 0) |
269 | goto out; | 268 | goto out; |
diff --git a/net/ipv4/fib_lookup.h b/net/ipv4/fib_lookup.h index 2c1623d2768b..637b133973bd 100644 --- a/net/ipv4/fib_lookup.h +++ b/net/ipv4/fib_lookup.h | |||
@@ -22,8 +22,7 @@ struct fib_alias { | |||
22 | /* Exported by fib_semantics.c */ | 22 | /* Exported by fib_semantics.c */ |
23 | extern int fib_semantic_match(struct list_head *head, | 23 | extern int fib_semantic_match(struct list_head *head, |
24 | const struct flowi *flp, | 24 | const struct flowi *flp, |
25 | struct fib_result *res, __be32 zone, __be32 mask, | 25 | struct fib_result *res, int prefixlen); |
26 | int prefixlen); | ||
27 | extern void fib_release_info(struct fib_info *); | 26 | extern void fib_release_info(struct fib_info *); |
28 | extern struct fib_info *fib_create_info(struct fib_config *cfg); | 27 | extern struct fib_info *fib_create_info(struct fib_config *cfg); |
29 | extern int fib_nh_match(struct fib_config *cfg, struct fib_info *fi); | 28 | extern int fib_nh_match(struct fib_config *cfg, struct fib_info *fi); |
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index f831df500907..9b096d6ff3f2 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c | |||
@@ -866,8 +866,7 @@ failure: | |||
866 | 866 | ||
867 | /* Note! fib_semantic_match intentionally uses RCU list functions. */ | 867 | /* Note! fib_semantic_match intentionally uses RCU list functions. */ |
868 | int fib_semantic_match(struct list_head *head, const struct flowi *flp, | 868 | int fib_semantic_match(struct list_head *head, const struct flowi *flp, |
869 | struct fib_result *res, __be32 zone, __be32 mask, | 869 | struct fib_result *res, int prefixlen) |
870 | int prefixlen) | ||
871 | { | 870 | { |
872 | struct fib_alias *fa; | 871 | struct fib_alias *fa; |
873 | int nh_sel = 0; | 872 | int nh_sel = 0; |
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index ec0ae490f0b6..9070d11058e5 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c | |||
@@ -1347,8 +1347,7 @@ static int check_leaf(struct trie *t, struct leaf *l, | |||
1347 | if (l->key != (key & ntohl(mask))) | 1347 | if (l->key != (key & ntohl(mask))) |
1348 | continue; | 1348 | continue; |
1349 | 1349 | ||
1350 | err = fib_semantic_match(&li->falh, flp, res, | 1350 | err = fib_semantic_match(&li->falh, flp, res, plen); |
1351 | htonl(l->key), mask, plen); | ||
1352 | 1351 | ||
1353 | #ifdef CONFIG_IP_FIB_TRIE_STATS | 1352 | #ifdef CONFIG_IP_FIB_TRIE_STATS |
1354 | if (err <= 0) | 1353 | if (err <= 0) |