2.5.49: compile with CONFIG_NET=n still broken

[Miles Bader]

[I haven't tried to compile without CONFIG_NET for a while, so I suppose
 this probably crept in earlier.]

With CONFIG_NET=n, I get two link errors:

  	v850e-elf-ld  -T arch/v850/vmlinux.lds.s arch/v850/kernel/head.o arch/v850/kernel/init_task.o  init/built-in.o --start-group  usr/built-in.o  arch/v850/kernel/built-in.o  kernel/built-in.o  mm/built-in.o  fs/built-in.o  ipc/built-in.o  security/built-in.o  crypto/built-in.o  lib/lib.a  arch/v850/lib/lib.a  drivers/built-in.o  sound/built-in.o  net/built-in.o --end-group  -o vmlinux
/proj/soft2/uclinux/uclinux/build/2.5.49-uc0-sim/net/socket.c:747: undefined reference to `dev_ioctl'
/proj/soft2/uclinux/uclinux/build/2.5.49-uc0-sim/include/net/xfrm.h:303: undefined reference to `__secpath_destroy'
make: *** [vmlinux] Error 1

(1) The `dev_ioctl' error is because of the added call in sock_ioctl
    (net/socket.c) to dev_ioctl #ifdefed on WIRELESS_EXT, which is defined
    in <linux/wireless.h>.  Since net/socket.c actually includes
    <linux/wireless.h> twice, once #ifdefed, and once not, I just got rid
    of the non-#ifdefed include, which seems to solve the problem:

diff -up ../orig/linux-2.5.49-uc0/net/socket.c net/socket.c
--- ../orig/linux-2.5.49-uc0/net/socket.c	2002-11-25 10:30:11.000000000 +0900
+++ net/socket.c	2002-11-25 10:39:07.000000000 +0900
@@ -75,7 +75,6 @@
 #include <linux/cache.h>
 #include <linux/module.h>
 #include <linux/highmem.h>
-#include <linux/wireless.h>
 #include <linux/divert.h>
 #include <linux/mount.h>
 

(2) `__secpath_destroy' is used by the inline function `secpath_put',
    in <net/xfrm.h>, and net/core/skbuff.c calls secpath_put -- but
    __secpath_destroy is defined in net/ipv4/xfrm_input.c, and the
    net/ipv4 directory isn't even compiled if CONFIG_NET=n.

    [I didn't know what to do about this, so I just commented out the call
    to __secpath_destroy in secpath_put]

Thanks,

-Miles

-- 
Next to fried food, the South has suffered most from oratory.
  			-- Walter Hines Page