]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ipv4: fill in table id when replacing a route
authorMichal Kubeček <mkubecek@suse.cz>
Fri, 22 May 2015 11:40:09 +0000 (13:40 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 May 2015 18:33:17 +0000 (14:33 -0400)
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>
net/ipv4/fib_trie.c

index 64c2076ced54c5c639518e30d1d23acf989d1167..09b62e17dd8cba4b1041de5f208180d278010604 100644 (file)
@@ -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,