Message ID | 20150522114009.043A6A0CCC@unicorn.suse.cz |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On 05/22/2015 04:40 AM, Michal Kubecek wrote: > 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> > --- > net/ipv4/fib_trie.c | 1 + > 1 file changed, 1 insertion(+) > > 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, > The patch looks good. Thanks. Acked-by: Alexander Duyck <alexander.h.duyck@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Michal Kubecek <mkubecek@suse.cz> Date: Fri, 22 May 2015 13:40:09 +0200 (CEST) > 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> Applied, thanks. In the future, please do not put an empty line between the Fixes: and other tags. I fixed it up for you this time. Thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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,
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> --- net/ipv4/fib_trie.c | 1 + 1 file changed, 1 insertion(+)