diff options
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/fib_hash.c | 16 | ||||
-rw-r--r-- | net/ipv4/fib_trie.c | 18 |
2 files changed, 17 insertions, 17 deletions
diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c index 86087d45c64e..9d5404158476 100644 --- a/net/ipv4/fib_hash.c +++ b/net/ipv4/fib_hash.c | |||
@@ -272,8 +272,6 @@ out: | |||
272 | return err; | 272 | return err; |
273 | } | 273 | } |
274 | 274 | ||
275 | static int fn_hash_last_dflt=-1; | ||
276 | |||
277 | static void | 275 | static void |
278 | fn_hash_select_default(struct fib_table *tb, const struct flowi *flp, struct fib_result *res) | 276 | fn_hash_select_default(struct fib_table *tb, const struct flowi *flp, struct fib_result *res) |
279 | { | 277 | { |
@@ -314,9 +312,9 @@ fn_hash_select_default(struct fib_table *tb, const struct flowi *flp, struct fib | |||
314 | if (next_fi != res->fi) | 312 | if (next_fi != res->fi) |
315 | break; | 313 | break; |
316 | } else if (!fib_detect_death(fi, order, &last_resort, | 314 | } else if (!fib_detect_death(fi, order, &last_resort, |
317 | &last_idx, fn_hash_last_dflt)) { | 315 | &last_idx, tb->tb_default)) { |
318 | fib_result_assign(res, fi); | 316 | fib_result_assign(res, fi); |
319 | fn_hash_last_dflt = order; | 317 | tb->tb_default = order; |
320 | goto out; | 318 | goto out; |
321 | } | 319 | } |
322 | fi = next_fi; | 320 | fi = next_fi; |
@@ -325,19 +323,20 @@ fn_hash_select_default(struct fib_table *tb, const struct flowi *flp, struct fib | |||
325 | } | 323 | } |
326 | 324 | ||
327 | if (order <= 0 || fi == NULL) { | 325 | if (order <= 0 || fi == NULL) { |
328 | fn_hash_last_dflt = -1; | 326 | tb->tb_default = -1; |
329 | goto out; | 327 | goto out; |
330 | } | 328 | } |
331 | 329 | ||
332 | if (!fib_detect_death(fi, order, &last_resort, &last_idx, fn_hash_last_dflt)) { | 330 | if (!fib_detect_death(fi, order, &last_resort, &last_idx, |
331 | tb->tb_default)) { | ||
333 | fib_result_assign(res, fi); | 332 | fib_result_assign(res, fi); |
334 | fn_hash_last_dflt = order; | 333 | tb->tb_default = order; |
335 | goto out; | 334 | goto out; |
336 | } | 335 | } |
337 | 336 | ||
338 | if (last_idx >= 0) | 337 | if (last_idx >= 0) |
339 | fib_result_assign(res, last_resort); | 338 | fib_result_assign(res, last_resort); |
340 | fn_hash_last_dflt = last_idx; | 339 | tb->tb_default = last_idx; |
341 | out: | 340 | out: |
342 | read_unlock(&fib_hash_lock); | 341 | read_unlock(&fib_hash_lock); |
343 | } | 342 | } |
@@ -773,6 +772,7 @@ struct fib_table * __init fib_hash_init(u32 id) | |||
773 | return NULL; | 772 | return NULL; |
774 | 773 | ||
775 | tb->tb_id = id; | 774 | tb->tb_id = id; |
775 | tb->tb_default = -1; | ||
776 | tb->tb_lookup = fn_hash_lookup; | 776 | tb->tb_lookup = fn_hash_lookup; |
777 | tb->tb_insert = fn_hash_insert; | 777 | tb->tb_insert = fn_hash_insert; |
778 | tb->tb_delete = fn_hash_delete; | 778 | tb->tb_delete = fn_hash_delete; |
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index c7c5c6c802df..9126eea71670 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c | |||
@@ -1782,8 +1782,6 @@ static int fn_trie_flush(struct fib_table *tb) | |||
1782 | return found; | 1782 | return found; |
1783 | } | 1783 | } |
1784 | 1784 | ||
1785 | static int trie_last_dflt = -1; | ||
1786 | |||
1787 | static void | 1785 | static void |
1788 | fn_trie_select_default(struct fib_table *tb, const struct flowi *flp, struct fib_result *res) | 1786 | fn_trie_select_default(struct fib_table *tb, const struct flowi *flp, struct fib_result *res) |
1789 | { | 1787 | { |
@@ -1830,28 +1828,29 @@ fn_trie_select_default(struct fib_table *tb, const struct flowi *flp, struct fib | |||
1830 | if (next_fi != res->fi) | 1828 | if (next_fi != res->fi) |
1831 | break; | 1829 | break; |
1832 | } else if (!fib_detect_death(fi, order, &last_resort, | 1830 | } else if (!fib_detect_death(fi, order, &last_resort, |
1833 | &last_idx, trie_last_dflt)) { | 1831 | &last_idx, tb->tb_default)) { |
1834 | fib_result_assign(res, fi); | 1832 | fib_result_assign(res, fi); |
1835 | trie_last_dflt = order; | 1833 | tb->tb_default = order; |
1836 | goto out; | 1834 | goto out; |
1837 | } | 1835 | } |
1838 | fi = next_fi; | 1836 | fi = next_fi; |
1839 | order++; | 1837 | order++; |
1840 | } | 1838 | } |
1841 | if (order <= 0 || fi == NULL) { | 1839 | if (order <= 0 || fi == NULL) { |
1842 | trie_last_dflt = -1; | 1840 | tb->tb_default = -1; |
1843 | goto out; | 1841 | goto out; |
1844 | } | 1842 | } |
1845 | 1843 | ||
1846 | if (!fib_detect_death(fi, order, &last_resort, &last_idx, trie_last_dflt)) { | 1844 | if (!fib_detect_death(fi, order, &last_resort, &last_idx, |
1845 | tb->tb_default)) { | ||
1847 | fib_result_assign(res, fi); | 1846 | fib_result_assign(res, fi); |
1848 | trie_last_dflt = order; | 1847 | tb->tb_default = order; |
1849 | goto out; | 1848 | goto out; |
1850 | } | 1849 | } |
1851 | if (last_idx >= 0) | 1850 | if (last_idx >= 0) |
1852 | fib_result_assign(res, last_resort); | 1851 | fib_result_assign(res, last_resort); |
1853 | trie_last_dflt = last_idx; | 1852 | tb->tb_default = last_idx; |
1854 | out:; | 1853 | out: |
1855 | rcu_read_unlock(); | 1854 | rcu_read_unlock(); |
1856 | } | 1855 | } |
1857 | 1856 | ||
@@ -1978,6 +1977,7 @@ struct fib_table * __init fib_hash_init(u32 id) | |||
1978 | return NULL; | 1977 | return NULL; |
1979 | 1978 | ||
1980 | tb->tb_id = id; | 1979 | tb->tb_id = id; |
1980 | tb->tb_default = -1; | ||
1981 | tb->tb_lookup = fn_trie_lookup; | 1981 | tb->tb_lookup = fn_trie_lookup; |
1982 | tb->tb_insert = fn_trie_insert; | 1982 | tb->tb_insert = fn_trie_insert; |
1983 | tb->tb_delete = fn_trie_delete; | 1983 | tb->tb_delete = fn_trie_delete; |