can: j1939: j1939_sk_bind(): return failure if netdev is down

[linux-2.6-microblaze.git] / net / ipv6 / route.c

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index fb075d9..7e0ce7a 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2745,7 +2745,8 @@ static void __ip6_rt_update_pmtu(struct dst_entry *dst, const struct sock *sk,
        if (confirm_neigh)
                dst_confirm_neigh(dst, daddr);
 
-       mtu = max_t(u32, mtu, IPV6_MIN_MTU);
+       if (mtu < IPV6_MIN_MTU)
+               return;
        if (mtu >= dst_mtu(dst))
                return;
 
@@ -5284,9 +5285,10 @@ static int ip6_route_multipath_del(struct fib6_config *cfg,
 {
        struct fib6_config r_cfg;
        struct rtnexthop *rtnh;
+       int last_err = 0;
        int remaining;
        int attrlen;
-       int err = 1, last_err = 0;
+       int err;
 
        remaining = cfg->fc_mp_len;
        rtnh = (struct rtnexthop *)cfg->fc_mp;