summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMichal Kubeček <mkubecek@suse.cz>2015-05-22 13:40:09 +0200
committerDavid S. Miller <davem@davemloft.net>2015-05-22 14:33:17 -0400
commitd4e64c2909231222ceba0999d921e7ac8908f656 (patch)
tree93271a649c38d40069ae1ad30e9d12a95a2748eb /net
parent44f6731d8b68fa02f5ed65eaceac41f8c3c9279e (diff)
downloadlinux-stable-d4e64c2909231222ceba0999d921e7ac8908f656.tar.gz
linux-stable-d4e64c2909231222ceba0999d921e7ac8908f656.tar.bz2
linux-stable-d4e64c2909231222ceba0999d921e7ac8908f656.zip
ipv4: fill in table id when replacing a route
When replacing an IPv4 route, tb_id member of the new fib_alias structure is not set in the replace code path so that the new route is ignored. Fixes: 0ddcf43d5d4a ("ipv4: FIB Local/MAIN table collapse") Signed-off-by: Michal Kubecek <mkubecek@suse.cz> Acked-by: Alexander Duyck <alexander.h.duyck@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/fib_trie.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 64c2076ced54..09b62e17dd8c 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -1164,6 +1164,7 @@ int fib_table_insert(struct fib_table *tb, struct fib_config *cfg)
state = fa->fa_state;
new_fa->fa_state = state & ~FA_S_ACCESSED;
new_fa->fa_slen = fa->fa_slen;
+ new_fa->tb_id = tb->tb_id;
err = netdev_switch_fib_ipv4_add(key, plen, fi,
new_fa->fa_tos,