Merge branch 'fixes' into for-linus

Conflicts:

	arch/arm/mach-versatile/core.c

1 files changed, 44 insertions, 11 deletions

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 63442a1e741c..89dc69924340 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1003,6 +1003,25 @@ int icmp6_dst_gc(void)
         return more;
 }
 
+static void icmp6_clean_all(int (*func)(struct rt6_info *rt, void *arg),
+                            void *arg)
+{
+        struct dst_entry *dst, **pprev;
+
+        spin_lock_bh(&icmp6_dst_lock);
+        pprev = &icmp6_dst_gc_list;
+        while ((dst = *pprev) != NULL) {
+                struct rt6_info *rt = (struct rt6_info *) dst;
+                if (func(rt, arg)) {
+                        *pprev = dst->next;
+                        dst_free(dst);
+                } else {
+                        pprev = &dst->next;
+                }
+        }
+        spin_unlock_bh(&icmp6_dst_lock);
+}
+
 static int ip6_dst_gc(struct dst_ops *ops)
 {
         unsigned long now = jiffies;
@@ -1814,16 +1833,19 @@ int ipv6_route_ioctl(struct net *net, unsigned int cmd, void __user *arg)
 static int ip6_pkt_drop(struct sk_buff *skb, int code, int ipstats_mib_noroutes)
 {
         int type;
+        struct dst_entry *dst = skb->dst;
         switch (ipstats_mib_noroutes) {
         case IPSTATS_MIB_INNOROUTES:
                 type = ipv6_addr_type(&ipv6_hdr(skb)->daddr);
                 if (type == IPV6_ADDR_ANY || type == IPV6_ADDR_RESERVED) {
-                        IP6_INC_STATS(ip6_dst_idev(skb->dst), IPSTATS_MIB_INADDRERRORS);
+                        IP6_INC_STATS(dev_net(dst->dev), ip6_dst_idev(dst),
+                                      IPSTATS_MIB_INADDRERRORS);
                         break;
                 }
                 /* FALLTHROUGH */
         case IPSTATS_MIB_OUTNOROUTES:
-                IP6_INC_STATS(ip6_dst_idev(skb->dst), ipstats_mib_noroutes);
+                IP6_INC_STATS(dev_net(dst->dev), ip6_dst_idev(dst),
+                              ipstats_mib_noroutes);
                 break;
         }
         icmpv6_send(skb, ICMPV6_DEST_UNREACH, code, 0, skb->dev);
@@ -1930,6 +1952,7 @@ void rt6_ifdown(struct net *net, struct net_device *dev)
         };
 
         fib6_clean_all(net, fib6_ifdown, 0, &adn);
+        icmp6_clean_all(fib6_ifdown, &adn);
 }
 
 struct rt6_mtu_change_arg
@@ -2611,10 +2634,8 @@ static int ip6_route_net_init(struct net *net)
         net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
                                                sizeof(*net->ipv6.ip6_prohibit_entry),
                                                GFP_KERNEL);
-        if (!net->ipv6.ip6_prohibit_entry) {
-                kfree(net->ipv6.ip6_null_entry);
-                goto out;
-        }
+        if (!net->ipv6.ip6_prohibit_entry)
+                goto out_ip6_null_entry;
         net->ipv6.ip6_prohibit_entry->u.dst.path =
                 (struct dst_entry *)net->ipv6.ip6_prohibit_entry;
         net->ipv6.ip6_prohibit_entry->u.dst.ops = net->ipv6.ip6_dst_ops;
@@ -2622,16 +2643,22 @@ static int ip6_route_net_init(struct net *net)
         net->ipv6.ip6_blk_hole_entry = kmemdup(&ip6_blk_hole_entry_template,
                                                sizeof(*net->ipv6.ip6_blk_hole_entry),
                                                GFP_KERNEL);
-        if (!net->ipv6.ip6_blk_hole_entry) {
-                kfree(net->ipv6.ip6_null_entry);
-                kfree(net->ipv6.ip6_prohibit_entry);
-                goto out;
-        }
+        if (!net->ipv6.ip6_blk_hole_entry)
+                goto out_ip6_prohibit_entry;
         net->ipv6.ip6_blk_hole_entry->u.dst.path =
                 (struct dst_entry *)net->ipv6.ip6_blk_hole_entry;
         net->ipv6.ip6_blk_hole_entry->u.dst.ops = net->ipv6.ip6_dst_ops;
 #endif
 
+        net->ipv6.sysctl.flush_delay = 0;
+        net->ipv6.sysctl.ip6_rt_max_size = 4096;
+        net->ipv6.sysctl.ip6_rt_gc_min_interval = HZ / 2;
+        net->ipv6.sysctl.ip6_rt_gc_timeout = 60*HZ;
+        net->ipv6.sysctl.ip6_rt_gc_interval = 30*HZ;
+        net->ipv6.sysctl.ip6_rt_gc_elasticity = 9;
+        net->ipv6.sysctl.ip6_rt_mtu_expires = 10*60*HZ;
+        net->ipv6.sysctl.ip6_rt_min_advmss = IPV6_MIN_MTU - 20 - 40;
+
 #ifdef CONFIG_PROC_FS
         proc_net_fops_create(net, "ipv6_route", 0, &ipv6_route_proc_fops);
         proc_net_fops_create(net, "rt6_stats", S_IRUGO, &rt6_stats_seq_fops);
@@ -2642,6 +2669,12 @@ static int ip6_route_net_init(struct net *net)
 out:
         return ret;
 
+#ifdef CONFIG_IPV6_MULTIPLE_TABLES
+out_ip6_prohibit_entry:
+        kfree(net->ipv6.ip6_prohibit_entry);
+out_ip6_null_entry:
+        kfree(net->ipv6.ip6_null_entry);
+#endif
 out_ip6_dst_ops:
         release_net(net->ipv6.ip6_dst_ops->dst_net);
         kfree(net->ipv6.ip6_dst_ops);