diff options
-rw-r--r-- | include/net/ip_fib.h | 2 | ||||
-rw-r--r-- | net/ipv4/fib_semantics.c | 2 | ||||
-rw-r--r-- | net/ipv4/route.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 3f6c943faedc..d948e232eb06 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h | |||
@@ -230,7 +230,7 @@ extern int fib_sync_down_dev(struct net_device *dev, int force); | |||
230 | extern int fib_sync_down_addr(struct net *net, __be32 local); | 230 | extern int fib_sync_down_addr(struct net *net, __be32 local); |
231 | extern void fib_update_nh_saddrs(struct net_device *dev); | 231 | extern void fib_update_nh_saddrs(struct net_device *dev); |
232 | extern int fib_sync_up(struct net_device *dev); | 232 | extern int fib_sync_up(struct net_device *dev); |
233 | extern void fib_select_multipath(const struct flowi *flp, struct fib_result *res); | 233 | extern void fib_select_multipath(struct fib_result *res); |
234 | 234 | ||
235 | /* Exported by fib_trie.c */ | 235 | /* Exported by fib_trie.c */ |
236 | extern void fib_trie_init(void); | 236 | extern void fib_trie_init(void); |
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index d73d7581b51f..b5d523b911e6 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c | |||
@@ -1210,7 +1210,7 @@ int fib_sync_up(struct net_device *dev) | |||
1210 | * The algorithm is suboptimal, but it provides really | 1210 | * The algorithm is suboptimal, but it provides really |
1211 | * fair weighted route distribution. | 1211 | * fair weighted route distribution. |
1212 | */ | 1212 | */ |
1213 | void fib_select_multipath(const struct flowi *flp, struct fib_result *res) | 1213 | void fib_select_multipath(struct fib_result *res) |
1214 | { | 1214 | { |
1215 | struct fib_info *fi = res->fi; | 1215 | struct fib_info *fi = res->fi; |
1216 | int w; | 1216 | int w; |
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index a7ac90cb151d..9c17e32d5623 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -2048,7 +2048,7 @@ static int ip_mkroute_input(struct sk_buff *skb, | |||
2048 | 2048 | ||
2049 | #ifdef CONFIG_IP_ROUTE_MULTIPATH | 2049 | #ifdef CONFIG_IP_ROUTE_MULTIPATH |
2050 | if (res->fi && res->fi->fib_nhs > 1) | 2050 | if (res->fi && res->fi->fib_nhs > 1) |
2051 | fib_select_multipath(fl, res); | 2051 | fib_select_multipath(res); |
2052 | #endif | 2052 | #endif |
2053 | 2053 | ||
2054 | /* create a routing cache entry */ | 2054 | /* create a routing cache entry */ |
@@ -2598,7 +2598,7 @@ static struct rtable *ip_route_output_slow(struct net *net, | |||
2598 | 2598 | ||
2599 | #ifdef CONFIG_IP_ROUTE_MULTIPATH | 2599 | #ifdef CONFIG_IP_ROUTE_MULTIPATH |
2600 | if (res.fi->fib_nhs > 1 && fl.oif == 0) | 2600 | if (res.fi->fib_nhs > 1 && fl.oif == 0) |
2601 | fib_select_multipath(&fl, &res); | 2601 | fib_select_multipath(&res); |
2602 | else | 2602 | else |
2603 | #endif | 2603 | #endif |
2604 | if (!res.prefixlen && res.type == RTN_UNICAST && !fl.oif) | 2604 | if (!res.prefixlen && res.type == RTN_UNICAST && !fl.oif) |