Re: Linux 2.4.6-ac4

From: David S. Miller (davem@redhat.com)
Date: Sun Jul 15 2001 - 19:49:28 EST


David Ford writes:
> Have you reviewed the patch I posted yesterday regarding net_dev_init()
> and double lock in sch_teql.c?
>
> net_dev_init() is originally called in genhd.c, I don't see as it's
> necessary to call it again.

It is called early if a device initialization occurs before
the genhd.c call, which is entirely possibly particularly on s390.
Your change would break s390* ports.

I sent the correct fix to Linus last night, which is:

--- net/core/dev.c.~1~ Mon Jul 9 22:19:33 2001
+++ net/core/dev.c Sat Jul 14 17:25:51 2001
@@ -2654,10 +2654,6 @@
         if (!dev_boot_phase)
                 return 0;
 
-#ifdef CONFIG_NET_SCHED
- pktsched_init();
-#endif
-
 #ifdef CONFIG_NET_DIVERT
         dv_init();
 #endif /* CONFIG_NET_DIVERT */
@@ -2771,6 +2767,10 @@
 
         dst_init();
         dev_mcast_init();
+
+#ifdef CONFIG_NET_SCHED
+ pktsched_init();
+#endif
 
         /*
          * Initialise network devices

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sun Jul 15 2001 - 21:00:23 EST