In addition, the body of the "while" is a null statement, so I
expanded it to "/* null */ ;" for better visibility.
In net/802/Makefile, llc_macinit.o has to be moved from O_OBJS to
OX_OBJS because it now exports symbols. (O_OBJS vs. OX_OBJS is a bit
clunky -- the system should take care of that automagically.)
In net/802/llc_macinit.c, since it now exports symbols, it must
include <linux/config.h>.
In drivers/net/wavelan.c, the use of "extern" before the definition of
"wavelan_probe" seems to be acceptable but very unusual. It also may
have had something to do with some intermittent compilation problems I
had. So this patch removes it.
Dale
--
Dale R. Worley Ariadne Internet Services
Voice: +1 617-899-7949 Fax: +1 617-899-7946 E-mail: worley@ariadne.com
"Internet-based electronic commerce solutions to real business problems."
----------------------------------------------------------------------
--- init/main.c.orig Thu Jan 16 10:31:58 1997
+++ init/main.c Thu Jan 16 10:34:06 1997
@@ -978,11 +978,12 @@
#ifdef CONFIG_BLK_DEV_INITRD
root_mountflags = real_root_mountflags;
if (mount_initrd && ROOT_DEV != real_root_dev && ROOT_DEV == MKDEV(RAMDISK_MAJOR,0)) {
- int error;
+ int error, pid, i;
pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD);
if (pid>0)
- while (pid != wait(&i));
+ while (pid != wait(&i))
+ /* null */ ;
if (real_root_dev != MKDEV(RAMDISK_MAJOR, 0)) {
error = change_root(real_root_dev,"/initrd");
if (error)
--- net/802/Makefile.orig Thu Jan 16 21:49:28 1997
+++ net/802/Makefile Thu Jan 16 21:50:18 1997
@@ -12,8 +12,8 @@
ifeq ($(CONFIG_LLC),y)
SUB_DIRS += transit
-O_OBJS += llc_macinit.o llc_sendpdu.o llc_utility.o cl2llc.o
-
+O_OBJS += llc_sendpdu.o llc_utility.o cl2llc.o
+OX_OBJS += llc_macinit.o
endif
--- net/802/llc_macinit.c.orig Thu Jan 2 08:13:27 1997
+++ net/802/llc_macinit.c Thu Jan 16 21:56:56 1997
@@ -19,6 +19,7 @@
* Started restructuring handlers
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/version.h>
#include <linux/kernel.h>
--- drivers/net/wavelan.c.orig Fri Jan 17 00:24:04 1997
+++ drivers/net/wavelan.c Fri Jan 17 00:25:21 1997
@@ -4017,7 +4017,7 @@
* We follow the example in drivers/net/ne.c.)
* (called in "Space.c")
*/
-extern int
+int
wavelan_probe(device * dev)
{
short base_addr;