]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ipv4: fix fib metrics
authorEric Dumazet <eric.dumazet@gmail.com>
Thu, 24 Mar 2011 07:01:24 +0000 (07:01 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 24 Mar 2011 18:49:54 +0000 (11:49 -0700)
Alessandro Suardi reported that we could not change route metrics :

ip ro change default .... advmss 1400

This regression came with commit 9c150e82ac50 (Allocate fib metrics
dynamically). fib_metrics is no longer an array, but a pointer to an
array.

Reported-by: Alessandro Suardi <alessandro.suardi@gmail.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Tested-by: Alessandro Suardi <alessandro.suardi@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/fib_semantics.c

index 622ac4c95026150a76d09e7df9a49aadf9e09420..75b9fb5d5d37b432f862135b1ee136594dea02ba 100644 (file)
@@ -251,7 +251,7 @@ static struct fib_info *fib_find_info(const struct fib_info *nfi)
                    nfi->fib_prefsrc == fi->fib_prefsrc &&
                    nfi->fib_priority == fi->fib_priority &&
                    memcmp(nfi->fib_metrics, fi->fib_metrics,
-                          sizeof(fi->fib_metrics)) == 0 &&
+                          sizeof(u32) * RTAX_MAX) == 0 &&
                    ((nfi->fib_flags ^ fi->fib_flags) & ~RTNH_F_DEAD) == 0 &&
                    (nfi->fib_nhs == 0 || nh_comp(fi, nfi) == 0))
                        return fi;