Re: bug in /net/core/dev.c

[DJBARROW@de.ibm.com]

[-- Attachment #1: Type: text/plain, Size: 908 bytes --]




Hi Keith,
This is a cure the syntom not the problem, build order shouldn't mess up
something this simple.
I've forwarded your patch to Ulrich & Martin ( the s390 maintainers ) &
they may use it
seeing as you & possibly others would prefer a /drivers/net/s390.
David admitted it is a bug, if the patch is good hopefully it will be
taken,
 it if better can be done hopefully someone will do better.

D.J. Barrow Gnu/Linux for S/390 kernel developer
eMail: djbarrow@de.ibm.com,barrow_dj@yahoo.com
Phone: +49-(0)7031-16-2583
IBM Germany Lab, Schönaicherstr. 220, 71032 Böblingen


Keith Owens <kaos@ocs.com.au> on 12.06.2001 18:11:26

Please respond to Keith Owens <kaos@ocs.com.au>

To:   "David S. Miller" <davem@redhat.com>
cc:   Denis Joseph Barrow/Germany/Contr/IBM@IBMDE,
      alan@lxorguk.ukuu.org.uk, linux-kernel@vger.kernel.org
Subject:  Re: bug in /net/core/dev.c




[-- Attachment #2: Type: text/plain, Size: 2000 bytes --]


On Tue, 12 Jun 2001 08:46:00 -0700 (PDT),
"David S. Miller" <davem@redhat.com> wrote:
>So, if the s390 folks move their stuff into the appropriate spot it
>will work.  In fact, I personally like to see the s390 net devices
>under drivers/net/s390 anyways.  They'll get free maintenance from
>myself and Jeff Garzik in this way as I rarely look int
>drivers/${PLATFORM} type directories unless I'm doing a tree-wide
>grep. :-)

Leave s390 separate for the moment, all the other architectures work
the same way.

Minimal (and totally untested) patch to compile s390/net as part of the
other network drivers follows - if it's good enough for acorn, it's
good enough for s390.  The method is as ugly as hell but it is the
least possible change for 2.4, major redesign will have to wait for
2.5.  Patch against 2.4.6-pre2.

Index: 6-pre2.1/drivers/s390/Makefile
--- 6-pre2.1/drivers/s390/Makefile Fri, 13 Apr 2001 12:02:38 +1000 kaos
(linux-2.4/u/b/43_Makefile 1.3 644)
+++ 6-pre2.1(w)/drivers/s390/Makefile Wed, 13 Jun 2001 02:05:24 +1000 kaos
(linux-2.4/u/b/43_Makefile 1.3 644)
@@ -4,7 +4,7 @@

 O_TARGET := io.o

-subdir-y := block char misc net
+subdir-y := block char misc
 subdir-m := $(subdir-y)
 obj-y := $(foreach dir,$(subdir-y),$(dir)/s390-$(dir).o)

@@ -12,3 +12,5 @@ obj-y += s390io.o s390mach.o s390dyn.o i
 export-objs += ccwcache.o idals.o s390dyn.o s390io.o

 include $(TOPDIR)/Rules.make
+
+# the NET subdir is included from drivers/net now
Index: 6-pre2.1/drivers/net/Makefile
--- 6-pre2.1/drivers/net/Makefile Thu, 17 May 2001 10:25:35 +1000 kaos
(linux-2.4/l/c/26_Makefile 1.1.1.1.3.3.1.1.1.2 644)
+++ 6-pre2.1(w)/drivers/net/Makefile Wed, 13 Jun 2001 02:03:09 +1000 kaos
(linux-2.4/l/c/26_Makefile 1.1.1.1.3.3.1.1.1.2 644)
@@ -214,6 +214,12 @@ subdir-y += ../acorn/net
 obj-y         += ../acorn/net/acorn-net.o
 endif

+ifeq ($(CONFIG_ARCH_S390),y)
+mod-subdirs   += ../s390/net
+subdir-y += ../s390/net
+obj-y         += ../s390/net/s390-net.o
+endif
+
 #
 # HIPPI adapters
 #