sstrip, nas support, mppe support, mac os x patches, syslogd on bootup, inittab correction

SVN-Revision: 136
2024-12-18 21:28:02 +00:00 · 2004-08-17 23:00:52 +00:00 · 2004-08-17 23:00:52 +00:00 · a9cbe76ba6
commit a9cbe76ba6
parent b8498ba479
23 changed files with 2758 additions and 528 deletions
--- a/obsolete-buildroot/Makefile
+++ b/obsolete-buildroot/Makefile
@ -40,9 +40,6 @@ BUILD_WITH_LARGEFILE:=true
 OPTIMIZE_FOR_CPU=$(ARCH)
 # directory used by 'make publish'
 PUB_DIR:=/var/www/html/testsite/ipkg
 # Command used to download source code
 WGET:=wget --passive-ftp
@ -151,7 +148,6 @@ TARGET_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
 TARGET_CC=$(TARGET_CROSS)gcc
 STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
 HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
 	-e 's/sparc.*/sparc/' \
 	-e 's/arm.*/arm/g' \
@ -191,13 +187,14 @@ TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
 PACKAGES_IPK:=$(patsubst %,%-ipk,$(PACKAGES))
 OPENWRT_IPK_DIR=$(SOURCE_DIR)/openwrt/ipkg
 $(BUILD_DIR)/Packages : $(PACKAGES_IPK)
 	(cd $(BUILD_DIR) ; $(IPKG_MAKE_INDEX) . > Packages)
 world: $(DL_DIR) $(TARGETS_SOURCE) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS)
 	@echo "ALL DONE."
-packages: ipkg-utils $(PACKAGES_IPK) $(BUILD_DIR)/Packages
+packages: ipkg-utils $(PACKAGES_IPK)
 	-@mkdir -p $(BASE_DIR)/packages
 	cd $(BASE_DIR)/packages
 	-mv $(BUILD_DIR)/*.ipk .
 	$(IPKG_MAKE_INDEX) . > Packages
 	@echo "ALL DONE."
 .PHONY: all world clean dirclean distclean source $(TARGETS) \
@ -240,11 +237,13 @@ source: $(TARGETS_SOURCE)
 #############################################################
 clean:
 	rm -rf $(TOOL_BUILD_DIR) $(BUILD_DIR) $(IMAGE) \
 		$(BASE_DIR)/packages \
 		openwrt-linux.trx openwrt-g-code.bin openwrt-gs-code.bin \
 		openwrt-kmodules.tar.bz2
 dirclean: $(TARGETS_DIRCLEAN)
 	rm -rf $(TARGET_DIR) $(STAGING_DIR) $(IMAGE) \
 		$(BASE_DIR)/packages \
 		openwrt-linux.trx openwrt-g-code.bin openwrt-gs-code.bin \
 		openwrt-kmodules.tar.bz2
@ -253,14 +252,6 @@ distclean:
 		openwrt-linux.trx openwrt-g-code.bin openwrt-gs-code.bin \
 		openwrt-kmodules.tar.bz2
 publish:	
 	chmod 644 $(BUILD_DIR)/Packages
 	chmod 644 $(BUILD_DIR)/Packages.filelist
 	chmod 644 $(BUILD_DIR)/*.ipk
 	cp $(BUILD_DIR)/Packages $(PUB_DIR)
 	cp $(BUILD_DIR)/Packages.filelist $(PUB_DIR)
 	cp $(BUILD_DIR)/*.ipk $(PUB_DIR)
 sourceball: 
 	rm -rf $(BUILD_DIR)
 	set -e; \
--- a/obsolete-buildroot/make/binutils-uclibc.mk
+++ b/obsolete-buildroot/make/binutils-uclibc.mk
@ -46,15 +46,15 @@ $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/ld: $(BINUTILS_DIR1)/binutils/objdump
 	$(MAKE) $(JLEVEL) -C $(BINUTILS_DIR1) install
 binutils-dependancies:
-	@if [ ! -x /usr/bin/bison ] ; then \
+	@if [ -z "`which bison`" ] ; then \
 		echo -e "\n\nYou must install 'bison' on your build machine\n"; \
 		exit 1; \
 	fi;
-	@if [ ! -x /usr/bin/flex ] ; then \
+	@if [ -z "`which flex`" ] ; then \
 		echo -e "\n\nYou must install 'flex' on your build machine\n"; \
 		exit 1; \
 	fi;
-	@if [ ! -x /usr/bin/msgfmt ] ; then \
+	@if [ -z "`which msgfmt`" ] ; then \
 		echo -e "\n\nYou must install 'gettext' on your build machine\n"; \
 		exit 1; \
 	fi;
--- a/obsolete-buildroot/make/ipkg-utils.mk
+++ b/obsolete-buildroot/make/ipkg-utils.mk
@ -37,5 +37,6 @@ ipkg-utils-dirclean:
 IPKG_BUILDPACKAGE := PATH=$(TARGET_PATH) ipkg-buildpackage -c -o root -g root
 IPKG_BUILD := PATH=$(TARGET_PATH) ipkg-build -c -o root -g root
 IPKG_MAKE_INDEX := PATH=$(TARGET_PATH) ipkg-make-index
--- a/obsolete-buildroot/make/openssh.mk
+++ b/obsolete-buildroot/make/openssh.mk
@ -108,7 +108,7 @@ $(OPENSSH_SERVER_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
 	cp $(OPENSSH_IPK_BUILD_DIR)/usr/sbin/sshd $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
 	mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
 	cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh-keygen $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build
 	rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
 $(OPENSSH_CLIENT_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
@ -123,7 +123,7 @@ $(OPENSSH_CLIENT_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
 	mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
 	cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
 	cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/scp $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build
 	rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
 $(OPENSSH_SFTP_SERVER_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
@ -132,7 +132,7 @@ $(OPENSSH_SFTP_SERVER_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
 	cp $(OPENSSH_IPK_DIR)/openssh.sftp-server.control $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/control
 	mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
 	cp $(OPENSSH_IPK_BUILD_DIR)/usr/sbin/sftp-server $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build
 	rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
 $(OPENSSH_SFTP_CLIENT_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
@ -141,7 +141,7 @@ $(OPENSSH_SFTP_CLIENT_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
 	cp $(OPENSSH_IPK_DIR)/openssh.sftp-client.control $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/control
 	mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
 	cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/sftp $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build
 	rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
 $(OPENSSH_CLIENT_EX_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
@ -154,7 +154,7 @@ $(OPENSSH_CLIENT_EX_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
 	cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh-keyscan $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
 	mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
 	cp $(OPENSSH_IPK_BUILD_DIR)/usr/sbin/ssh-keysign $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build
 	rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
 openssh-ipk: $(OPENSSH_SERVER_IPK) $(OPENSSH_CLIENT_IPK) \
--- a/obsolete-buildroot/make/openssl.mk
+++ b/obsolete-buildroot/make/openssl.mk
@ -77,7 +77,7 @@ $(LIBSSL_IPK): uclibc $(STAGING_DIR)/lib/libcrypto.a
 	cp -fa $(STAGING_DIR)/lib/libssl.so* $(OPENSSL_IPK_BUILD_DIR)/usr/lib/
 	-$(STRIP) --strip-unneeded $(OPENSSL_IPK_BUILD_DIR)/usr/lib/libssl.so.0.9.7
 	-$(STRIP) --strip-unneeded $(OPENSSL_IPK_BUILD_DIR)/usr/lib/libcrypto.so.0.9.7
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSL_IPK_BUILD_DIR)
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSL_IPK_BUILD_DIR)
 openssl-ipk: $(LIBSSL_IPK)
--- a/obsolete-buildroot/make/openwrt.mk
+++ b/obsolete-buildroot/make/openwrt.mk
@ -49,7 +49,7 @@ $(LINUX_DIR)/.unpacked: $(WRT54G_DIR)/.prepared
 	touch $(LINUX_DIR)/.unpacked
 $(LINUX_DIR)/.patched: $(WRT54G_DIR)/.prepared
-	$(SOURCE_DIR)/patch-kernel.sh $(LINUX_DIR)/../.. $(SOURCE_DIR)/openwrt/kernel/patches
+	$(SOURCE_DIR)/patch-kernel.sh $(LINUX_DIR) $(SOURCE_DIR)/openwrt/kernel/patches
 	# use replacement diag module code
 	cp -f $(SOURCE_DIR)/openwrt/kernel/diag.c $(LINUX_DIR)/drivers/net/diag/diag_led.c
 	cp -f $(SOURCE_DIR)/openwrt/kernel/linux.config $(LINUX_DIR)/.config
@ -76,7 +76,7 @@ $(LINUX_DIR)/$(LINUX_BINLOC): $(LINUX_DIR)/.depend_done
 openwrt-kmodules.tar.bz2: $(LINUX_DIR)/$(LINUX_BINLOC)
 	$(MAKE) -C $(LINUX_DIR) modules
-	$(MAKE) -C $(LINUX_DIR) DEPMOD=/bin/true \
+	$(MAKE) -C $(LINUX_DIR) DEPMOD=true \
 		INSTALL_MOD_PATH=$(LINUX_DIR)/modules modules_install
 	tar -C $(LINUX_DIR)/modules/lib -cjf openwrt-kmodules.tar.bz2 modules
@ -202,8 +202,8 @@ openwrt-rootprep:
 ######################################################################
-openwrt-prune: openwrt-base
+openwrt-prune: $(STAGING_DIR)/bin/sstrip openwrt-base
-	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
+	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STAGING_DIR)/bin/sstrip 2>/dev/null || true;
 	# remove unneeded uClibc libs
 	rm -rf $(TARGET_DIR)/lib/libthread_db*
 	rm -rf $(TARGET_DIR)/lib/libpthread*
@ -217,6 +217,9 @@ openwrt-prune: openwrt-base
 ######################################################################
 $(STAGING_DIR)/bin/sstrip:
 	$(CC) -o $(STAGING_DIR)/bin/sstrip -I$(STAGING_DIR)/mipsel-linux-uclibc/include $(SOURCE_DIR)/openwrt/tools/sstrip.c
 wrt-tools:
 	$(CC) -o $(WRT54G_DIR)/release/tools/trx $(SOURCE_DIR)/openwrt/tools/trx.c
 	$(CC) -o $(WRT54G_DIR)/release/tools/addpattern $(SOURCE_DIR)/openwrt/tools/addpattern.c
--- a/obsolete-buildroot/make/pppoecd.mk
+++ b/obsolete-buildroot/make/pppoecd.mk
@ -47,7 +47,7 @@ $(PPPOECD_IPK_BUILD_DIR)/CONTROL/control:
 # build the ipk package
 $(PPPOECD_PACKAGE): $(PPPOECD_IPK_BIN) $(PPPOECD_IPK_BUILD_DIR)/CONTROL/control
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(PPPOECD_IPK_BUILD_DIR)
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(PPPOECD_IPK_BUILD_DIR)
 # main target for building the ipk version
 pppoecd-ipk: $(PPPOECD_PACKAGE)
--- a/obsolete-buildroot/make/zlib.mk
+++ b/obsolete-buildroot/make/zlib.mk
@ -71,7 +71,7 @@ $(ZLIB_IPK): uclibc $(STAGING_DIR)/lib/libz.so.1.1.4
 	cp -dpf $(STAGING_DIR)/lib/libz.so* $(ZLIB_IPK_DIR)/lib;
 	-$(STRIP) --strip-unneeded $(ZLIB_IPK_DIR)/lib/libz.so*
 	touch -c $(ZLIB_IPK_DIR)/lib/libz.so.1.1.4
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(ZLIB_IPK_DIR)
+	cd $(ZLIB_IPK_DIR) $(IPKG_BUILDPACKAGE)
 zlib-ipk: $(ZLIB_IPK)
--- a/obsolete-buildroot/sources/openwrt/kernel/linux.config
+++ b/obsolete-buildroot/sources/openwrt/kernel/linux.config
@ -1,5 +1,5 @@
 #
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
 #
 CONFIG_MIPS=y
 CONFIG_MIPS32=y
@ -152,10 +152,6 @@ CONFIG_MTD=y
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_CONCAT is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 #
 # User Modules And Translation Layers
 #
 CONFIG_MTD_CHAR=y
 # CONFIG_MTD_BLOCK is not set
 CONFIG_MTD_BLOCK_RO=y
@ -211,10 +207,6 @@ CONFIG_MTD_SFLASH=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_MTDRAM is not set
 # CONFIG_MTD_BLKMTD is not set
 #
 # Disk-On-Chip Device Drivers
 #
 # CONFIG_MTD_DOC1000 is not set
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
@ -420,10 +412,6 @@ CONFIG_IP6_NF_TARGET_MARK=m
 # CONFIG_KHTTPD is not set
 # CONFIG_ATM is not set
 CONFIG_VLAN_8021Q=y
 #
 #  
 #
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
@ -585,10 +573,11 @@ CONFIG_NET_ETHERNET=y
 CONFIG_PPP=y
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPP_FILTER is not set
-CONFIG_PPP_ASYNC=y
+CONFIG_PPP_ASYNC=m
 # CONFIG_PPP_SYNC_TTY is not set
-CONFIG_PPP_DEFLATE=y
+CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=y
+CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_MPPE=m
 CONFIG_PPPOE=m
 # CONFIG_SLIP is not set
@ -671,14 +660,6 @@ CONFIG_UNIX98_PTY_COUNT=128
 # Joysticks
 #
 # CONFIG_INPUT_GAMEPORT is not set
 #
 # Input core support is needed for gameports
 #
 #
 # Input core support is needed for joysticks
 #
 # CONFIG_QIC02_TAPE is not set
 #
--- a/obsolete-buildroot/sources/openwrt/kernel/patches/100-revert_netfilter.patch
+++ b/obsolete-buildroot/sources/openwrt/kernel/patches/100-revert_netfilter.patch
@ -1,6 +1,6 @@
-diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack.h src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack.h
+diff -Nurb linux/include/linux/netfilter_ipv4/ip_conntrack.h linux.stock/include/linux/netfilter_ipv4/ip_conntrack.h
--- src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack.h	2003-08-12 07:43:11.000000000 -0400
+--- linux/include/linux/netfilter_ipv4/ip_conntrack.h	2003-08-12 07:43:11.000000000 -0400
-+++ src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack.h	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/include/linux/netfilter_ipv4/ip_conntrack.h	2004-05-09 04:13:03.000000000 -0400
@@ -45,39 +45,27 @@
 #include <linux/netfilter_ipv4/ip_conntrack_tcp.h>
@ -73,9 +73,9 @@ diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack.h src/linux
 -extern int sysctl_ip_conntrack_udp_timeouts[2];
 #endif /* __KERNEL__ */
 #endif /* _IP_CONNTRACK_H */
-diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_h323.h src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack_h323.h
+diff -Nurb linux/include/linux/netfilter_ipv4/ip_conntrack_h323.h linux.stock/include/linux/netfilter_ipv4/ip_conntrack_h323.h
--- src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_h323.h	2003-07-04 04:12:27.000000000 -0400
+--- linux/include/linux/netfilter_ipv4/ip_conntrack_h323.h	2003-07-04 04:12:27.000000000 -0400
-+++ src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack_h323.h	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/include/linux/netfilter_ipv4/ip_conntrack_h323.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,30 +0,0 @@
 -#ifndef _IP_CONNTRACK_H323_H
 -#define _IP_CONNTRACK_H323_H
@ -107,9 +107,9 @@ diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_h323.h src/
 -};
 -
 -#endif /* _IP_CONNTRACK_H323_H */
-diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_mms.h src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack_mms.h
+diff -Nurb linux/include/linux/netfilter_ipv4/ip_conntrack_mms.h linux.stock/include/linux/netfilter_ipv4/ip_conntrack_mms.h
--- src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_mms.h	2003-07-04 04:12:27.000000000 -0400
+--- linux/include/linux/netfilter_ipv4/ip_conntrack_mms.h	2003-07-04 04:12:27.000000000 -0400
-+++ src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack_mms.h	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/include/linux/netfilter_ipv4/ip_conntrack_mms.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,31 +0,0 @@
 -#ifndef _IP_CONNTRACK_MMS_H
 -#define _IP_CONNTRACK_MMS_H
@ -142,9 +142,9 @@ diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_mms.h src/l
 -};
 -
 -#endif /* _IP_CONNTRACK_MMS_H */
-diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_pptp.h src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
+diff -Nurb linux/include/linux/netfilter_ipv4/ip_conntrack_pptp.h linux.stock/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
--- src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_pptp.h	2003-07-04 04:12:27.000000000 -0400
+--- linux/include/linux/netfilter_ipv4/ip_conntrack_pptp.h	2003-07-04 04:12:27.000000000 -0400
-+++ src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack_pptp.h	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/include/linux/netfilter_ipv4/ip_conntrack_pptp.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,313 +0,0 @@
 -/* PPTP constants and structs */
 -#ifndef _CONNTRACK_PPTP_H
@ -459,9 +459,9 @@ diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_pptp.h src/
 -
 -#endif /* __KERNEL__ */
 -#endif /* _CONNTRACK_PPTP_H */
-diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
+diff -Nurb linux/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h linux.stock/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
--- src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h	2003-07-04 04:12:27.000000000 -0400
+--- linux/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h	2003-07-04 04:12:27.000000000 -0400
-+++ src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,121 +0,0 @@
 -#ifndef _CONNTRACK_PROTO_GRE_H
 -#define _CONNTRACK_PROTO_GRE_H
@ -584,9 +584,9 @@ diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
 -#endif /* __KERNEL__ */
 -
 -#endif /* _CONNTRACK_PROTO_GRE_H */
-diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_tftp.h src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack_tftp.h
+diff -Nurb linux/include/linux/netfilter_ipv4/ip_conntrack_tftp.h linux.stock/include/linux/netfilter_ipv4/ip_conntrack_tftp.h
--- src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_tftp.h	2003-07-04 04:12:27.000000000 -0400
+--- linux/include/linux/netfilter_ipv4/ip_conntrack_tftp.h	2003-07-04 04:12:27.000000000 -0400
-+++ src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack_tftp.h	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/include/linux/netfilter_ipv4/ip_conntrack_tftp.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
 -#ifndef _IP_CT_TFTP
 -#define _IP_CT_TFTP
@ -601,9 +601,9 @@ diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_tftp.h src/
 -#define TFTP_OPCODE_WRITE	2
 -
 -#endif /* _IP_CT_TFTP */
-diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_tuple.h src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
+diff -Nurb linux/include/linux/netfilter_ipv4/ip_conntrack_tuple.h linux.stock/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
--- src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	2003-07-04 04:12:27.000000000 -0400
+--- linux/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	2003-07-04 04:12:27.000000000 -0400
-+++ src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	2004-05-09 04:13:03.000000000 -0400
@@ -14,7 +14,7 @@
 union ip_conntrack_manip_proto
 {
@ -664,9 +664,9 @@ diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_tuple.h src
 #define CTINFO2DIR(ctinfo) ((ctinfo) >= IP_CT_IS_REPLY ? IP_CT_DIR_REPLY : IP_CT_DIR_ORIGINAL)
-diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_nat_pptp.h src/linux/linux.stock/include/linux/netfilter_ipv4/ip_nat_pptp.h
+diff -Nurb linux/include/linux/netfilter_ipv4/ip_nat_pptp.h linux.stock/include/linux/netfilter_ipv4/ip_nat_pptp.h
--- src/linux/linux/include/linux/netfilter_ipv4/ip_nat_pptp.h	2003-07-04 04:12:27.000000000 -0400
+--- linux/include/linux/netfilter_ipv4/ip_nat_pptp.h	2003-07-04 04:12:27.000000000 -0400
-+++ src/linux/linux.stock/include/linux/netfilter_ipv4/ip_nat_pptp.h	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/include/linux/netfilter_ipv4/ip_nat_pptp.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
 -/* PPTP constants and structs */
 -#ifndef _NAT_PPTP_H
@ -679,9 +679,9 @@ diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_nat_pptp.h src/linux/
 -};
 -
 -#endif /* _NAT_PPTP_H */
-diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_pool.h src/linux/linux.stock/include/linux/netfilter_ipv4/ip_pool.h
+diff -Nurb linux/include/linux/netfilter_ipv4/ip_pool.h linux.stock/include/linux/netfilter_ipv4/ip_pool.h
--- src/linux/linux/include/linux/netfilter_ipv4/ip_pool.h	2003-07-04 04:12:27.000000000 -0400
+--- linux/include/linux/netfilter_ipv4/ip_pool.h	2003-07-04 04:12:27.000000000 -0400
-+++ src/linux/linux.stock/include/linux/netfilter_ipv4/ip_pool.h	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/include/linux/netfilter_ipv4/ip_pool.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,64 +0,0 @@
 -#ifndef _IP_POOL_H
 -#define _IP_POOL_H
@ -747,9 +747,9 @@ diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_pool.h src/linux/linu
 -#endif
 -
 -#endif /*_IP_POOL_H*/
-diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ipt_pool.h src/linux/linux.stock/include/linux/netfilter_ipv4/ipt_pool.h
+diff -Nurb linux/include/linux/netfilter_ipv4/ipt_pool.h linux.stock/include/linux/netfilter_ipv4/ipt_pool.h
--- src/linux/linux/include/linux/netfilter_ipv4/ipt_pool.h	2003-07-04 04:12:27.000000000 -0400
+--- linux/include/linux/netfilter_ipv4/ipt_pool.h	2003-07-04 04:12:27.000000000 -0400
-+++ src/linux/linux.stock/include/linux/netfilter_ipv4/ipt_pool.h	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/include/linux/netfilter_ipv4/ipt_pool.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,25 +0,0 @@
 -#ifndef _IPT_POOL_H
 -#define _IPT_POOL_H
@ -776,9 +776,9 @@ diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ipt_pool.h src/linux/lin
 -};
 -
 -#endif /*_IPT_POOL_H*/
-diff -Nurb src/linux/linux/net/ipv4/netfilter/Config.in src/linux/linux.stock/net/ipv4/netfilter/Config.in
+diff -Nurb linux/net/ipv4/netfilter/Config.in linux.stock/net/ipv4/netfilter/Config.in
--- src/linux/linux/net/ipv4/netfilter/Config.in	2004-02-19 06:04:35.000000000 -0500
+--- linux/net/ipv4/netfilter/Config.in	2004-02-19 06:04:35.000000000 -0500
-+++ src/linux/linux.stock/net/ipv4/netfilter/Config.in	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/net/ipv4/netfilter/Config.in	2004-05-09 04:13:03.000000000 -0400
@@ -7,12 +7,7 @@
 tristate 'Connection tracking (required for masq/NAT)' CONFIG_IP_NF_CONNTRACK
 if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; then
@ -878,9 +878,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/Config.in src/linux/linux.stock/ne
     fi
   fi
-diff -Nurb src/linux/linux/net/ipv4/netfilter/Makefile src/linux/linux.stock/net/ipv4/netfilter/Makefile
+diff -Nurb linux/net/ipv4/netfilter/Makefile linux.stock/net/ipv4/netfilter/Makefile
--- src/linux/linux/net/ipv4/netfilter/Makefile	2004-02-19 06:04:35.000000000 -0500
+--- linux/net/ipv4/netfilter/Makefile	2004-02-19 06:04:35.000000000 -0500
-+++ src/linux/linux.stock/net/ipv4/netfilter/Makefile	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/net/ipv4/netfilter/Makefile	2004-05-09 04:13:03.000000000 -0400
@@ -31,48 +31,20 @@
 # connection tracking
 obj-$(CONFIG_IP_NF_CONNTRACK) += ip_conntrack.o
@ -968,9 +968,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/Makefile src/linux/linux.stock/net
 # generic ARP tables
 obj-$(CONFIG_IP_NF_ARPTABLES) += arp_tables.o
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_core.c src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_core.c
+diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_core.c linux.stock/net/ipv4/netfilter/ip_conntrack_core.c
--- src/linux/linux/net/ipv4/netfilter/ip_conntrack_core.c	2003-08-12 07:33:45.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_conntrack_core.c	2003-08-12 07:33:45.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_core.c	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/net/ipv4/netfilter/ip_conntrack_core.c	2004-05-09 04:13:03.000000000 -0400
@@ -47,7 +47,11 @@
 #define IP_CONNTRACK_VERSION	"2.1"
@ -1225,9 +1225,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_core.c src/linux/linu
  	{ 0 }
 };
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_ftp.c src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_ftp.c
+diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_ftp.c linux.stock/net/ipv4/netfilter/ip_conntrack_ftp.c
--- src/linux/linux/net/ipv4/netfilter/ip_conntrack_ftp.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_conntrack_ftp.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_ftp.c	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/net/ipv4/netfilter/ip_conntrack_ftp.c	2004-05-09 04:13:03.000000000 -0400
@@ -24,7 +24,11 @@
 static int loose = 0;
 MODULE_PARM(loose, "i");
@ -1273,9 +1273,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_ftp.c src/linux/linux
 	if (tcp_v4_check(tcph, tcplen, iph->saddr, iph->daddr,
 			 csum_partial((char *)tcph, tcplen, 0))) {
 		DEBUGP("ftp_help: bad csum: %p %u %u.%u.%u.%u %u.%u.%u.%u\n",
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_h323.c src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_h323.c
+diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_h323.c linux.stock/net/ipv4/netfilter/ip_conntrack_h323.c
--- src/linux/linux/net/ipv4/netfilter/ip_conntrack_h323.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_conntrack_h323.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_h323.c	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/net/ipv4/netfilter/ip_conntrack_h323.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,302 +0,0 @@
 -/* 
 - * H.323 'brute force' extension for H.323 connection tracking. 
@ -1579,9 +1579,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_h323.c src/linux/linu
 -
 -module_init(init);
 -module_exit(fini);
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_mms.c src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_mms.c
+diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_mms.c linux.stock/net/ipv4/netfilter/ip_conntrack_mms.c
--- src/linux/linux/net/ipv4/netfilter/ip_conntrack_mms.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_conntrack_mms.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_mms.c	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/net/ipv4/netfilter/ip_conntrack_mms.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,292 +0,0 @@
 -/* MMS extension for IP connection tracking
 - * (C) 2002 by Filip Sneppe <filip.sneppe@cronos.be>
@ -1875,9 +1875,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_mms.c src/linux/linux
 -
 -module_init(init);
 -module_exit(fini);
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_pptp.c src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_pptp.c
+diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_pptp.c linux.stock/net/ipv4/netfilter/ip_conntrack_pptp.c
--- src/linux/linux/net/ipv4/netfilter/ip_conntrack_pptp.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_conntrack_pptp.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_pptp.c	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/net/ipv4/netfilter/ip_conntrack_pptp.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,531 +0,0 @@
 -/*
 - * ip_conntrack_pptp.c	- Version 1.11
@ -2410,9 +2410,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_pptp.c src/linux/linu
 -module_exit(fini);
 -
 -EXPORT_SYMBOL(ip_pptp_lock);
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_pptp_priv.h src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_pptp_priv.h
+diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_pptp_priv.h linux.stock/net/ipv4/netfilter/ip_conntrack_pptp_priv.h
--- src/linux/linux/net/ipv4/netfilter/ip_conntrack_pptp_priv.h	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_conntrack_pptp_priv.h	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_pptp_priv.h	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/net/ipv4/netfilter/ip_conntrack_pptp_priv.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,24 +0,0 @@
 -#ifndef _IP_CT_PPTP_PRIV_H
 -#define _IP_CT_PPTP_PRIV_H
@ -2438,9 +2438,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_pptp_priv.h src/linux
 -};
 -
 -#endif
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_gre.c src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_proto_gre.c
+diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_proto_gre.c linux.stock/net/ipv4/netfilter/ip_conntrack_proto_gre.c
--- src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_gre.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_conntrack_proto_gre.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_proto_gre.c	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/net/ipv4/netfilter/ip_conntrack_proto_gre.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,320 +0,0 @@
 -/*
 - * ip_conntrack_proto_gre.c - Version 1.11
@ -2762,9 +2762,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_gre.c src/linux
 -
 -module_init(init);
 -module_exit(fini);
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c linux.stock/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
--- src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c	2003-08-12 07:33:45.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c	2003-08-12 07:33:45.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_proto_tcp.c	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/net/ipv4/netfilter/ip_conntrack_proto_tcp.c	2004-05-09 04:13:03.000000000 -0400
@@ -15,11 +15,17 @@
 #include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
 #include <linux/netfilter_ipv4/lockhelp.h>
@ -2835,9 +2835,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c src/linux
 	}
 	return NF_ACCEPT;
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_udp.c src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_proto_udp.c
+diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_proto_udp.c linux.stock/net/ipv4/netfilter/ip_conntrack_proto_udp.c
--- src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_udp.c	2003-08-12 07:33:45.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_conntrack_proto_udp.c	2003-08-12 07:33:45.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_proto_udp.c	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/net/ipv4/netfilter/ip_conntrack_proto_udp.c	2004-05-09 04:13:03.000000000 -0400
@@ -5,7 +5,9 @@
 #include <linux/in.h>
 #include <linux/udp.h>
@ -2865,9 +2865,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_udp.c src/linux
 	return NF_ACCEPT;
 }
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_standalone.c src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_standalone.c
+diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_standalone.c linux.stock/net/ipv4/netfilter/ip_conntrack_standalone.c
--- src/linux/linux/net/ipv4/netfilter/ip_conntrack_standalone.c	2003-08-12 07:33:45.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_conntrack_standalone.c	2003-08-12 07:33:45.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_standalone.c	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/net/ipv4/netfilter/ip_conntrack_standalone.c	2004-05-09 04:13:03.000000000 -0400
@@ -27,7 +27,11 @@
 #include <linux/netfilter_ipv4/ip_conntrack_helper.h>
 #include <linux/netfilter_ipv4/listhelp.h>
@ -2917,9 +2917,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_standalone.c src/linu
 EXPORT_SYMBOL(ip_conntrack_expect_related);
 EXPORT_SYMBOL(ip_conntrack_change_expect);
 EXPORT_SYMBOL(ip_conntrack_unexpect_related);
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_tftp.c src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_tftp.c
+diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_tftp.c linux.stock/net/ipv4/netfilter/ip_conntrack_tftp.c
--- src/linux/linux/net/ipv4/netfilter/ip_conntrack_tftp.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_conntrack_tftp.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_tftp.c	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/net/ipv4/netfilter/ip_conntrack_tftp.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,126 +0,0 @@
 -/*
 - * Licensed under GNU GPL version 2 Copyright Magnus Boden <mb@ozaba.mine.nu>
@ -3047,9 +3047,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_tftp.c src/linux/linu
 -
 -module_init(init);
 -module_exit(fini);
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_core.c src/linux/linux.stock/net/ipv4/netfilter/ip_nat_core.c
+diff -Nurb linux/net/ipv4/netfilter/ip_nat_core.c linux.stock/net/ipv4/netfilter/ip_nat_core.c
--- src/linux/linux/net/ipv4/netfilter/ip_nat_core.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_nat_core.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_nat_core.c	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/net/ipv4/netfilter/ip_nat_core.c	2004-05-09 04:13:03.000000000 -0400
@@ -31,7 +31,11 @@
 #include <linux/netfilter_ipv4/ip_conntrack_helper.h>
 #include <linux/netfilter_ipv4/listhelp.h>
@ -3170,9 +3170,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_core.c src/linux/linux.stoc
 	IP_NF_ASSERT(ip_conntrack_destroyed == NULL);
 	ip_conntrack_destroyed = &ip_nat_cleanup_conntrack;
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_h323.c src/linux/linux.stock/net/ipv4/netfilter/ip_nat_h323.c
+diff -Nurb linux/net/ipv4/netfilter/ip_nat_h323.c linux.stock/net/ipv4/netfilter/ip_nat_h323.c
--- src/linux/linux/net/ipv4/netfilter/ip_nat_h323.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_nat_h323.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_nat_h323.c	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/net/ipv4/netfilter/ip_nat_h323.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,403 +0,0 @@
 -/* 
 - * H.323 'brute force' extension for NAT alteration. 
@ -3577,9 +3577,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_h323.c src/linux/linux.stoc
 -
 -module_init(init);
 -module_exit(fini);
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_helper.c src/linux/linux.stock/net/ipv4/netfilter/ip_nat_helper.c
+diff -Nurb linux/net/ipv4/netfilter/ip_nat_helper.c linux.stock/net/ipv4/netfilter/ip_nat_helper.c
--- src/linux/linux/net/ipv4/netfilter/ip_nat_helper.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_nat_helper.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_nat_helper.c	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/net/ipv4/netfilter/ip_nat_helper.c	2004-05-09 04:13:03.000000000 -0400
@@ -8,9 +8,6 @@
  *		- add support for SACK adjustment 
  *	14 Mar 2002 Harald Welte <laforge@gnumonks.org>:
@ -3785,9 +3785,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_helper.c src/linux/linux.st
 /* Adjust one found SACK option including checksum correction */
 static void
 sack_adjust(struct tcphdr *tcph, 
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_mms.c src/linux/linux.stock/net/ipv4/netfilter/ip_nat_mms.c
+diff -Nurb linux/net/ipv4/netfilter/ip_nat_mms.c linux.stock/net/ipv4/netfilter/ip_nat_mms.c
--- src/linux/linux/net/ipv4/netfilter/ip_nat_mms.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_nat_mms.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_nat_mms.c	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/net/ipv4/netfilter/ip_nat_mms.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,330 +0,0 @@
 -/* MMS extension for TCP NAT alteration.
 - * (C) 2002 by Filip Sneppe <filip.sneppe@cronos.be>
@ -4119,9 +4119,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_mms.c src/linux/linux.stock
 -
 -module_init(init);
 -module_exit(fini);
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_pptp.c src/linux/linux.stock/net/ipv4/netfilter/ip_nat_pptp.c
+diff -Nurb linux/net/ipv4/netfilter/ip_nat_pptp.c linux.stock/net/ipv4/netfilter/ip_nat_pptp.c
--- src/linux/linux/net/ipv4/netfilter/ip_nat_pptp.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_nat_pptp.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_nat_pptp.c	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/net/ipv4/netfilter/ip_nat_pptp.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,412 +0,0 @@
 -/*
 - * ip_nat_pptp.c	- Version 1.11
@ -4535,9 +4535,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_pptp.c src/linux/linux.stoc
 -
 -module_init(init);
 -module_exit(fini);
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_proto_gre.c src/linux/linux.stock/net/ipv4/netfilter/ip_nat_proto_gre.c
+diff -Nurb linux/net/ipv4/netfilter/ip_nat_proto_gre.c linux.stock/net/ipv4/netfilter/ip_nat_proto_gre.c
--- src/linux/linux/net/ipv4/netfilter/ip_nat_proto_gre.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_nat_proto_gre.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_nat_proto_gre.c	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/net/ipv4/netfilter/ip_nat_proto_gre.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,212 +0,0 @@
 -/*
 - * ip_nat_proto_gre.c - Version 1.11
@ -4751,9 +4751,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_proto_gre.c src/linux/linux
 -
 -module_init(init);
 -module_exit(fini);
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_standalone.c src/linux/linux.stock/net/ipv4/netfilter/ip_nat_standalone.c
+diff -Nurb linux/net/ipv4/netfilter/ip_nat_standalone.c linux.stock/net/ipv4/netfilter/ip_nat_standalone.c
--- src/linux/linux/net/ipv4/netfilter/ip_nat_standalone.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_nat_standalone.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_nat_standalone.c	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/net/ipv4/netfilter/ip_nat_standalone.c	2004-05-09 04:13:03.000000000 -0400
@@ -37,7 +37,11 @@
 #include <linux/netfilter_ipv4/ip_conntrack_core.h>
 #include <linux/netfilter_ipv4/listhelp.h>
@ -4773,9 +4773,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_standalone.c src/linux/linu
 -EXPORT_SYMBOL(ip_nat_mangle_udp_packet);
 EXPORT_SYMBOL(ip_nat_used_tuple);
 MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_tftp.c src/linux/linux.stock/net/ipv4/netfilter/ip_nat_tftp.c
+diff -Nurb linux/net/ipv4/netfilter/ip_nat_tftp.c linux.stock/net/ipv4/netfilter/ip_nat_tftp.c
--- src/linux/linux/net/ipv4/netfilter/ip_nat_tftp.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_nat_tftp.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_nat_tftp.c	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/net/ipv4/netfilter/ip_nat_tftp.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,186 +0,0 @@
 -/*
 - * Licensed under GNU GPL version 2 Copyright Magnus Boden <mb@ozaba.mine.nu>
@ -4963,9 +4963,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_tftp.c src/linux/linux.stoc
 -
 -module_init(init);
 -module_exit(fini);
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_pool.c src/linux/linux.stock/net/ipv4/netfilter/ip_pool.c
+diff -Nurb linux/net/ipv4/netfilter/ip_pool.c linux.stock/net/ipv4/netfilter/ip_pool.c
--- src/linux/linux/net/ipv4/netfilter/ip_pool.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_pool.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_pool.c	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/net/ipv4/netfilter/ip_pool.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,328 +0,0 @@
 -/* Kernel module for IP pool management */
 -
@ -5295,9 +5295,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_pool.c src/linux/linux.stock/ne
 -
 -module_init(init);
 -module_exit(fini);
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_tables.c src/linux/linux.stock/net/ipv4/netfilter/ip_tables.c
+diff -Nurb linux/net/ipv4/netfilter/ip_tables.c linux.stock/net/ipv4/netfilter/ip_tables.c
--- src/linux/linux/net/ipv4/netfilter/ip_tables.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ip_tables.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ip_tables.c	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/net/ipv4/netfilter/ip_tables.c	2004-05-09 04:13:03.000000000 -0400
@@ -62,6 +62,11 @@
 #include <linux/netfilter_ipv4/lockhelp.h>
 #include <linux/netfilter_ipv4/listhelp.h>
@ -5492,9 +5492,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_tables.c src/linux/linux.stock/
 #endif
 }
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ipchains_core.c src/linux/linux.stock/net/ipv4/netfilter/ipchains_core.c
+diff -Nurb linux/net/ipv4/netfilter/ipchains_core.c linux.stock/net/ipv4/netfilter/ipchains_core.c
--- src/linux/linux/net/ipv4/netfilter/ipchains_core.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ipchains_core.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ipchains_core.c	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/net/ipv4/netfilter/ipchains_core.c	2004-05-09 04:13:03.000000000 -0400
@@ -977,10 +977,17 @@
 		    || ftmp->ipfw.fw_dst.s_addr!=frwl->ipfw.fw_dst.s_addr
 		    || ftmp->ipfw.fw_smsk.s_addr!=frwl->ipfw.fw_smsk.s_addr
@ -5521,9 +5521,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ipchains_core.c src/linux/linux.st
 	int reset = 0;
 #endif
 	struct ip_chain *i;
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ipfwadm_core.c src/linux/linux.stock/net/ipv4/netfilter/ipfwadm_core.c
+diff -Nurb linux/net/ipv4/netfilter/ipfwadm_core.c linux.stock/net/ipv4/netfilter/ipfwadm_core.c
--- src/linux/linux/net/ipv4/netfilter/ipfwadm_core.c	2003-10-14 04:09:33.000000000 -0400
+--- linux/net/ipv4/netfilter/ipfwadm_core.c	2003-10-14 04:09:33.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ipfwadm_core.c	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/net/ipv4/netfilter/ipfwadm_core.c	2004-05-09 04:13:03.000000000 -0400
@@ -20,7 +20,7 @@
  *	license in recognition of the original copyright.
  *				-- Alan Cox.
@ -5565,9 +5565,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ipfwadm_core.c src/linux/linux.sto
 	int reset = 0;
 #endif
 	return ip_chain_procinfo(IP_FW_FWD, buffer,start,offset,length,
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ipt_ECN.c src/linux/linux.stock/net/ipv4/netfilter/ipt_ECN.c
+diff -Nurb linux/net/ipv4/netfilter/ipt_ECN.c linux.stock/net/ipv4/netfilter/ipt_ECN.c
--- src/linux/linux/net/ipv4/netfilter/ipt_ECN.c	2003-10-14 04:02:57.000000000 -0400
+--- linux/net/ipv4/netfilter/ipt_ECN.c	2003-10-14 04:02:57.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ipt_ECN.c	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/net/ipv4/netfilter/ipt_ECN.c	2004-05-09 04:13:03.000000000 -0400
@@ -87,8 +87,8 @@
 	}
@ -5579,9 +5579,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ipt_ECN.c src/linux/linux.stock/ne
 		tcph->check = csum_fold(csum_partial((char *)diffs,
 		                                    sizeof(diffs),
 		                                    tcph->check^0xFFFF));
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ipt_LOG.c src/linux/linux.stock/net/ipv4/netfilter/ipt_LOG.c
+diff -Nurb linux/net/ipv4/netfilter/ipt_LOG.c linux.stock/net/ipv4/netfilter/ipt_LOG.c
--- src/linux/linux/net/ipv4/netfilter/ipt_LOG.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ipt_LOG.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ipt_LOG.c	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/net/ipv4/netfilter/ipt_LOG.c	2004-05-09 04:13:03.000000000 -0400
@@ -14,11 +14,15 @@
 #include <net/route.h>
 #include <linux/netfilter_ipv4/ipt_LOG.h>
@ -5599,9 +5599,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ipt_LOG.c src/linux/linux.stock/ne
 /* Use lock to serialize, so printks don't overlap */
 static spinlock_t log_lock = SPIN_LOCK_UNLOCKED;
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ipt_REJECT.c src/linux/linux.stock/net/ipv4/netfilter/ipt_REJECT.c
+diff -Nurb linux/net/ipv4/netfilter/ipt_REJECT.c linux.stock/net/ipv4/netfilter/ipt_REJECT.c
--- src/linux/linux/net/ipv4/netfilter/ipt_REJECT.c	2003-07-04 04:12:31.000000000 -0400
+--- linux/net/ipv4/netfilter/ipt_REJECT.c	2003-07-04 04:12:31.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ipt_REJECT.c	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/net/ipv4/netfilter/ipt_REJECT.c	2004-05-09 04:13:03.000000000 -0400
@@ -6,8 +6,6 @@
 #include <linux/module.h>
 #include <linux/skbuff.h>
@ -5667,9 +5667,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ipt_REJECT.c src/linux/linux.stock
 	memcpy(data, skb_in->nh.iph,
 	       length - sizeof(struct iphdr) - sizeof(struct icmphdr));
 	icmph->checksum = ip_compute_csum((unsigned char *)icmph,
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ipt_ULOG.c src/linux/linux.stock/net/ipv4/netfilter/ipt_ULOG.c
+diff -Nurb linux/net/ipv4/netfilter/ipt_ULOG.c linux.stock/net/ipv4/netfilter/ipt_ULOG.c
--- src/linux/linux/net/ipv4/netfilter/ipt_ULOG.c	2003-07-04 04:12:32.000000000 -0400
+--- linux/net/ipv4/netfilter/ipt_ULOG.c	2003-07-04 04:12:32.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ipt_ULOG.c	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/net/ipv4/netfilter/ipt_ULOG.c	2004-05-09 04:13:03.000000000 -0400
@@ -12,7 +12,6 @@
  * 	      module loadtime -HW
  * 2002/07/07 remove broken nflog_rcv() function -HW
@ -5710,9 +5710,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ipt_ULOG.c src/linux/linux.stock/n
 	if (in)
 		strncpy(pm->indev_name, in->name, sizeof(pm->indev_name));
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ipt_multiport.c src/linux/linux.stock/net/ipv4/netfilter/ipt_multiport.c
+diff -Nurb linux/net/ipv4/netfilter/ipt_multiport.c linux.stock/net/ipv4/netfilter/ipt_multiport.c
--- src/linux/linux/net/ipv4/netfilter/ipt_multiport.c	2003-07-04 04:12:32.000000000 -0400
+--- linux/net/ipv4/netfilter/ipt_multiport.c	2003-07-04 04:12:32.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ipt_multiport.c	2004-05-09 04:13:03.000000000 -0400
+++ linux.stock/net/ipv4/netfilter/ipt_multiport.c	2004-05-09 04:13:03.000000000 -0400
@@ -8,7 +8,11 @@
 #include <linux/netfilter_ipv4/ipt_multiport.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
@ -5734,9 +5734,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ipt_multiport.c src/linux/linux.st
 		&& matchsize == IPT_ALIGN(sizeof(struct ipt_multiport))
 		&& (multiinfo->flags == IPT_MULTIPORT_SOURCE
 		    || multiinfo->flags == IPT_MULTIPORT_DESTINATION
-diff -Nurb src/linux/linux/net/ipv4/netfilter/ipt_pool.c src/linux/linux.stock/net/ipv4/netfilter/ipt_pool.c
+diff -Nurb linux/net/ipv4/netfilter/ipt_pool.c linux.stock/net/ipv4/netfilter/ipt_pool.c
--- src/linux/linux/net/ipv4/netfilter/ipt_pool.c	2003-07-04 04:12:32.000000000 -0400
+--- linux/net/ipv4/netfilter/ipt_pool.c	2003-07-04 04:12:32.000000000 -0400
-+++ src/linux/linux.stock/net/ipv4/netfilter/ipt_pool.c	1969-12-31 19:00:00.000000000 -0500
+++ linux.stock/net/ipv4/netfilter/ipt_pool.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,71 +0,0 @@
 -/* Kernel module to match an IP address pool. */
 -
@ -5809,9 +5809,9 @@ diff -Nurb src/linux/linux/net/ipv4/netfilter/ipt_pool.c src/linux/linux.stock/n
 -
 -module_init(init);
 -module_exit(fini);
-diff -Nurb src/linux/linux/net/ipv6/mcast.c src/linux/linux.stock/net/ipv6/mcast.c
+diff -Nurb linux/net/ipv6/mcast.c linux.stock/net/ipv6/mcast.c
--- src/linux/linux/net/ipv6/mcast.c	2003-10-14 04:09:34.000000000 -0400
+--- linux/net/ipv6/mcast.c	2003-10-14 04:09:34.000000000 -0400
-+++ src/linux/linux.stock/net/ipv6/mcast.c	2004-05-09 04:13:22.000000000 -0400
+++ linux.stock/net/ipv6/mcast.c	2004-05-09 04:13:22.000000000 -0400
@@ -5,7 +5,7 @@
  *	Authors:
  *	Pedro Roque		<roque@di.fc.ul.pt>	
@ -5821,3 +5821,14 @@ diff -Nurb src/linux/linux/net/ipv6/mcast.c src/linux/linux.stock/net/ipv6/mcast
  *
  *	Based on linux/ipv4/igmp.c and linux/ipv4/ip_sockglue.c 
  *
 --- linux/include/linux/ppp-comp.h	2004-08-16 20:58:32.089851872 -0400
 +++ linux.stock/include/linux/ppp-comp.h	2004-08-16 20:59:48.217278744 -0400
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
 - * $Id: ppp-comp.h,v 1.1.1.4 2003/10/14 08:09:26 sparq Exp $
 + * $Id: ppp-comp.h,v 1.6 1997/11/27 06:04:44 paulus Exp $
  */
 /*
--- a/obsolete-buildroot/sources/openwrt/kernel/patches/110-sch_htb.patch
+++ b/obsolete-buildroot/sources/openwrt/kernel/patches/110-sch_htb.patch
@ -1,5 +1,5 @@
--- src/linux/linux/net/sched/sch_htb.c	2003-10-14 01:09:35.000000000 -0700
+--- linux/net/sched/sch_htb.c	2003-10-14 01:09:35.000000000 -0700
-+++ src/linux/linux.2.4.26/net/sched/sch_htb.c	2004-05-10 00:05:51.000000000 -0700
+++ linux.2.4.26/net/sched/sch_htb.c	2004-05-10 00:05:51.000000000 -0700
@@ -9,6 +9,8 @@
  * Authors:	Martin Devera, <devik@cdi.cz>
  *
@ -553,8 +553,8 @@
 			cl->un.leaf.quantum = 200000;
 		}
 		if (hopt->quantum)
--- src/linux/linux/include/net/pkt_cls.h	2003-07-04 01:12:28.000000000 -0700
+--- linux/include/net/pkt_cls.h	2003-07-04 01:12:28.000000000 -0700
-+++ src/linux/linux.2.4.26/include/net/pkt_cls.h	2004-05-10 22:21:40.000000000 -0700
+++ linux.2.4.26/include/net/pkt_cls.h	2004-05-10 22:21:40.000000000 -0700
@@ -77,7 +77,11 @@
 	return -1;
 }
--- a/obsolete-buildroot/sources/openwrt/kernel/patches/120-openwrt.patch
+++ b/obsolete-buildroot/sources/openwrt/kernel/patches/120-openwrt.patch
@ -1,6 +1,6 @@
-diff -Nurb src/linux/linux.orig/Makefile src/linux/linux/Makefile
+diff -Nurb linux.orig/Makefile linux/Makefile
--- src/linux/linux.orig/Makefile	2003-10-14 04:00:10.000000000 -0400
+--- linux.orig/Makefile	2003-10-14 04:00:10.000000000 -0400
-+++ src/linux/linux/Makefile	2004-05-25 21:12:24.000000000 -0400
+++ linux/Makefile	2004-05-25 21:12:24.000000000 -0400
@@ -17,7 +17,7 @@
 FINDHPATH	= $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu
@ -19,9 +19,9 @@ diff -Nurb src/linux/linux.orig/Makefile src/linux/linux/Makefile
 	  -fno-strict-aliasing -fno-common
 # Turn on -pg to instrument the kernel with calls to mcount().
-diff -Nurb src/linux/linux.orig/arch/mips/brcm-boards/bcm947xx/setup.c src/linux/linux/arch/mips/brcm-boards/bcm947xx/setup.c
+diff -Nurb linux.orig/arch/mips/brcm-boards/bcm947xx/setup.c linux/arch/mips/brcm-boards/bcm947xx/setup.c
--- src/linux/linux.orig/arch/mips/brcm-boards/bcm947xx/setup.c	2003-11-11 09:08:46.000000000 -0500
+--- linux.orig/arch/mips/brcm-boards/bcm947xx/setup.c	2003-11-11 09:08:46.000000000 -0500
-+++ src/linux/linux/arch/mips/brcm-boards/bcm947xx/setup.c	2004-05-25 21:12:24.000000000 -0400
+++ linux/arch/mips/brcm-boards/bcm947xx/setup.c	2004-05-25 21:12:24.000000000 -0400
@@ -27,6 +27,7 @@
 #include <linux/ext2_fs.h>
 #include <linux/romfs_fs.h>
@ -223,9 +223,9 @@ diff -Nurb src/linux/linux.orig/arch/mips/brcm-boards/bcm947xx/setup.c src/linux
 	return bcm947xx_parts;
 }
-diff -Nurb src/linux/linux.orig/drivers/mtd/maps/bcm947xx-flash.c src/linux/linux/drivers/mtd/maps/bcm947xx-flash.c
+diff -Nurb linux.orig/drivers/mtd/maps/bcm947xx-flash.c linux/drivers/mtd/maps/bcm947xx-flash.c
--- src/linux/linux.orig/drivers/mtd/maps/bcm947xx-flash.c	2003-11-08 04:35:52.000000000 -0500
+--- linux.orig/drivers/mtd/maps/bcm947xx-flash.c	2003-11-08 04:35:52.000000000 -0500
-+++ src/linux/linux/drivers/mtd/maps/bcm947xx-flash.c	2004-05-25 21:12:24.000000000 -0400
+++ linux/drivers/mtd/maps/bcm947xx-flash.c	2004-05-25 21:12:24.000000000 -0400
@@ -82,7 +82,21 @@
 void bcm947xx_map_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
@ -248,9 +248,9 @@ diff -Nurb src/linux/linux.orig/drivers/mtd/maps/bcm947xx-flash.c src/linux/linu
 }
 void bcm947xx_map_write8(struct map_info *map, __u8 d, unsigned long adr)
-diff -Nurb src/linux/linux.orig/drivers/net/Makefile src/linux/linux/drivers/net/Makefile
+diff -Nurb linux.orig/drivers/net/Makefile linux/drivers/net/Makefile
--- src/linux/linux.orig/drivers/net/Makefile	2004-02-12 21:35:15.000000000 -0500
+--- linux.orig/drivers/net/Makefile	2004-02-12 21:35:15.000000000 -0500
-+++ src/linux/linux/drivers/net/Makefile	2004-05-25 21:12:24.000000000 -0400
+++ linux/drivers/net/Makefile	2004-05-25 21:12:24.000000000 -0400
@@ -25,7 +25,7 @@
 list-multi	:=	rcpci.o
 rcpci-objs	:=	rcpci45.o rclanmtl.o
@ -260,9 +260,9 @@ diff -Nurb src/linux/linux.orig/drivers/net/Makefile src/linux/linux/drivers/net
 subdir-m += diag
 ifeq ($(CONFIG_HW_QOS),y)
-diff -Nurb src/linux/linux.orig/fs/Config.in src/linux/linux/fs/Config.in
+diff -Nurb linux.orig/fs/Config.in linux/fs/Config.in
--- src/linux/linux.orig/fs/Config.in	2003-07-04 04:12:05.000000000 -0400
+--- linux.orig/fs/Config.in	2003-07-04 04:12:05.000000000 -0400
-+++ src/linux/linux/fs/Config.in	2004-05-25 21:13:03.000000000 -0400
+++ linux/fs/Config.in	2004-05-25 21:13:03.000000000 -0400
@@ -47,6 +47,7 @@
    int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0
 fi
@ -271,9 +271,9 @@ diff -Nurb src/linux/linux.orig/fs/Config.in src/linux/linux/fs/Config.in
 bool 'Virtual memory file system support (former shm fs)' CONFIG_TMPFS
 define_bool CONFIG_RAMFS y
-diff -Nurb src/linux/linux.orig/fs/Makefile src/linux/linux/fs/Makefile
+diff -Nurb linux.orig/fs/Makefile linux/fs/Makefile
--- src/linux/linux.orig/fs/Makefile	2003-07-04 04:12:05.000000000 -0400
+--- linux.orig/fs/Makefile	2003-07-04 04:12:05.000000000 -0400
-+++ src/linux/linux/fs/Makefile	2004-05-25 21:13:03.000000000 -0400
+++ linux/fs/Makefile	2004-05-25 21:13:03.000000000 -0400
@@ -68,6 +68,7 @@
 subdir-$(CONFIG_SUN_OPENPROMFS)	+= openpromfs
 subdir-$(CONFIG_BEFS_FS)	+= befs
@ -282,9 +282,9 @@ diff -Nurb src/linux/linux.orig/fs/Makefile src/linux/linux/fs/Makefile
 obj-$(CONFIG_BINFMT_AOUT)	+= binfmt_aout.o
-diff -Nurb src/linux/linux.orig/fs/squashfs/Makefile src/linux/linux/fs/squashfs/Makefile
+diff -Nurb linux.orig/fs/squashfs/Makefile linux/fs/squashfs/Makefile
--- src/linux/linux.orig/fs/squashfs/Makefile	1969-12-31 19:00:00.000000000 -0500
+--- linux.orig/fs/squashfs/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/fs/squashfs/Makefile	2004-05-25 21:13:03.000000000 -0400
+++ linux/fs/squashfs/Makefile	2004-05-25 21:13:03.000000000 -0400
@@ -0,0 +1,11 @@
 +#
 +# Makefile for the linux squashfs routines.
@ -297,9 +297,9 @@ diff -Nurb src/linux/linux.orig/fs/squashfs/Makefile src/linux/linux/fs/squashfs
 +obj-m := $(O_TARGET)
 +
 +include $(TOPDIR)/Rules.make
-diff -Nurb src/linux/linux.orig/fs/squashfs/inode.c src/linux/linux/fs/squashfs/inode.c
+diff -Nurb linux.orig/fs/squashfs/inode.c linux/fs/squashfs/inode.c
--- src/linux/linux.orig/fs/squashfs/inode.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.orig/fs/squashfs/inode.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/fs/squashfs/inode.c	2004-05-25 21:13:03.000000000 -0400
+++ linux/fs/squashfs/inode.c	2004-05-25 21:13:03.000000000 -0400
@@ -0,0 +1,1515 @@
 +/*
 + * Squashfs - a compressed read only filesystem for Linux
@ -1816,9 +1816,9 @@ diff -Nurb src/linux/linux.orig/fs/squashfs/inode.c src/linux/linux/fs/squashfs/
 +MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
 +MODULE_AUTHOR("Phillip Lougher <plougher@users.sourceforge.net>");
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.orig/include/linux/fs.h src/linux/linux/include/linux/fs.h
+diff -Nurb linux.orig/include/linux/fs.h linux/include/linux/fs.h
--- src/linux/linux.orig/include/linux/fs.h	2003-07-04 04:12:25.000000000 -0400
+--- linux.orig/include/linux/fs.h	2003-07-04 04:12:25.000000000 -0400
-+++ src/linux/linux/include/linux/fs.h	2004-05-25 21:13:03.000000000 -0400
+++ linux/include/linux/fs.h	2004-05-25 21:13:03.000000000 -0400
@@ -313,6 +313,7 @@
 #include <linux/usbdev_fs_i.h>
 #include <linux/jffs2_fs_i.h>
@ -1851,9 +1851,9 @@ diff -Nurb src/linux/linux.orig/include/linux/fs.h src/linux/linux/include/linux
 		void			*generic_sbp;
 	} u;
 	/*
-diff -Nurb src/linux/linux.orig/include/linux/squashfs_fs.h src/linux/linux/include/linux/squashfs_fs.h
+diff -Nurb linux.orig/include/linux/squashfs_fs.h linux/include/linux/squashfs_fs.h
--- src/linux/linux.orig/include/linux/squashfs_fs.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.orig/include/linux/squashfs_fs.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/squashfs_fs.h	2004-05-25 21:13:03.000000000 -0400
+++ linux/include/linux/squashfs_fs.h	2004-05-25 21:13:03.000000000 -0400
@@ -0,0 +1,474 @@
 +#ifndef SQUASHFS_FS
 +#define SQUASHFS_FS
@ -2329,9 +2329,9 @@ diff -Nurb src/linux/linux.orig/include/linux/squashfs_fs.h src/linux/linux/incl
 +#define SQUASHFS_MEMSET(s, d, n)	memset(s, 0, n);
 +#endif
 +#endif
-diff -Nurb src/linux/linux.orig/include/linux/squashfs_fs_i.h src/linux/linux/include/linux/squashfs_fs_i.h
+diff -Nurb linux.orig/include/linux/squashfs_fs_i.h linux/include/linux/squashfs_fs_i.h
--- src/linux/linux.orig/include/linux/squashfs_fs_i.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.orig/include/linux/squashfs_fs_i.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/squashfs_fs_i.h	2004-05-25 21:13:03.000000000 -0400
+++ linux/include/linux/squashfs_fs_i.h	2004-05-25 21:13:03.000000000 -0400
@@ -0,0 +1,33 @@
 +#ifndef SQUASHFS_FS_I
 +#define SQUASHFS_FS_I
@ -2366,9 +2366,9 @@ diff -Nurb src/linux/linux.orig/include/linux/squashfs_fs_i.h src/linux/linux/in
 +	unsigned int	fragment_offset;
 +	} squashfs_inode_info;
 +#endif
-diff -Nurb src/linux/linux.orig/include/linux/squashfs_fs_sb.h src/linux/linux/include/linux/squashfs_fs_sb.h
+diff -Nurb linux.orig/include/linux/squashfs_fs_sb.h linux/include/linux/squashfs_fs_sb.h
--- src/linux/linux.orig/include/linux/squashfs_fs_sb.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.orig/include/linux/squashfs_fs_sb.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/squashfs_fs_sb.h	2004-05-25 21:13:03.000000000 -0400
+++ linux/include/linux/squashfs_fs_sb.h	2004-05-25 21:13:03.000000000 -0400
@@ -0,0 +1,65 @@
 +#ifndef SQUASHFS_FS_SB
 +#define SQUASHFS_FS_SB
@ -2435,9 +2435,9 @@ diff -Nurb src/linux/linux.orig/include/linux/squashfs_fs_sb.h src/linux/linux/i
 +					char *block_list, char **block_p, unsigned int *bsize);
 +	} squashfs_sb_info;
 +#endif
-diff -Nurb src/linux/linux.orig/init/do_mounts.c src/linux/linux/init/do_mounts.c
+diff -Nurb linux.orig/init/do_mounts.c linux/init/do_mounts.c
--- src/linux/linux.orig/init/do_mounts.c	2003-11-08 03:13:20.000000000 -0500
+--- linux.orig/init/do_mounts.c	2003-11-08 03:13:20.000000000 -0500
-+++ src/linux/linux/init/do_mounts.c	2004-05-25 21:13:03.000000000 -0400
+++ linux/init/do_mounts.c	2004-05-25 21:13:03.000000000 -0400
@@ -16,6 +16,7 @@
 #include <linux/ext2_fs.h>
 #include <linux/romfs_fs.h>
@ -2486,9 +2486,9 @@ diff -Nurb src/linux/linux.orig/init/do_mounts.c src/linux/linux/init/do_mounts.
 	/*
 	 * Read block 1 to test for minix and ext2 superblock
 	 */
-diff -Nurb src/linux/linux.orig/kernel/ksyms.c src/linux/linux/kernel/ksyms.c
+diff -Nurb linux.orig/kernel/ksyms.c linux/kernel/ksyms.c
--- src/linux/linux.orig/kernel/ksyms.c	2003-07-04 04:12:28.000000000 -0400
+--- linux.orig/kernel/ksyms.c	2003-07-04 04:12:28.000000000 -0400
-+++ src/linux/linux/kernel/ksyms.c	2004-05-25 21:12:24.000000000 -0400
+++ linux/kernel/ksyms.c	2004-05-25 21:12:24.000000000 -0400
@@ -482,9 +482,9 @@
 EXPORT_SYMBOL(simple_strtoull);
 EXPORT_SYMBOL(system_utsname);	/* UTS data */
@ -2501,9 +2501,9 @@ diff -Nurb src/linux/linux.orig/kernel/ksyms.c src/linux/linux/kernel/ksyms.c
 EXPORT_SYMBOL(machine_restart);
 EXPORT_SYMBOL(machine_halt);
 EXPORT_SYMBOL(machine_power_off);
-diff -Nurb src/linux/linux.orig/lib/Config.in src/linux/linux/lib/Config.in
+diff -Nurb linux.orig/lib/Config.in linux/lib/Config.in
--- src/linux/linux.orig/lib/Config.in	2003-07-04 04:12:29.000000000 -0400
+--- linux.orig/lib/Config.in	2003-07-04 04:12:29.000000000 -0400
-+++ src/linux/linux/lib/Config.in	2004-05-25 21:13:03.000000000 -0400
+++ linux/lib/Config.in	2004-05-25 21:13:03.000000000 -0400
@@ -8,12 +8,14 @@
 # Do we need the compression support?
 #
--- a/obsolete-buildroot/sources/openwrt/kernel/patches/130-nfsswap.patch
+++ b/obsolete-buildroot/sources/openwrt/kernel/patches/130-nfsswap.patch
@ -1,6 +1,6 @@
-diff -Nurb src/linux/linux.orig/Documentation/netswap.txt src/linux/linux/Documentation/netswap.txt
+diff -Nurb linux.orig/Documentation/netswap.txt linux/Documentation/netswap.txt
--- src/linux/linux.orig/Documentation/netswap.txt	1969-12-31 19:00:00.000000000 -0500
+--- linux.orig/Documentation/netswap.txt	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/Documentation/netswap.txt	2004-05-31 02:18:03.000000000 -0400
+++ linux/Documentation/netswap.txt	2004-05-31 02:18:03.000000000 -0400
@@ -0,0 +1,51 @@
 +                     Swapping over network
 +
@ -53,9 +53,9 @@ diff -Nurb src/linux/linux.orig/Documentation/netswap.txt src/linux/linux/Docume
 +
 +Swapping over the network is insecure unless the data would be
 +encrypted, which is not the case with NFS. It is also very slow.
-diff -Nurb src/linux/linux.orig/Documentation/nfsswap.txt src/linux/linux/Documentation/nfsswap.txt
+diff -Nurb linux.orig/Documentation/nfsswap.txt linux/Documentation/nfsswap.txt
--- src/linux/linux.orig/Documentation/nfsswap.txt	1969-12-31 19:00:00.000000000 -0500
+--- linux.orig/Documentation/nfsswap.txt	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/Documentation/nfsswap.txt	2004-05-31 02:18:03.000000000 -0400
+++ linux/Documentation/nfsswap.txt	2004-05-31 02:18:03.000000000 -0400
@@ -0,0 +1,41 @@
 +                   Swapping to files on NFS volumes
 +
@ -98,9 +98,9 @@ diff -Nurb src/linux/linux.orig/Documentation/nfsswap.txt src/linux/linux/Docume
 +Swapping  over  the network is   insecure   unless the data  would  be
 +encrypted, which is not the case with NFS. It is also very slow.
 +
-diff -Nurb src/linux/linux.orig/drivers/block/blkpg.c src/linux/linux/drivers/block/blkpg.c
+diff -Nurb linux.orig/drivers/block/blkpg.c linux/drivers/block/blkpg.c
--- src/linux/linux.orig/drivers/block/blkpg.c	2003-07-04 04:11:31.000000000 -0400
+--- linux.orig/drivers/block/blkpg.c	2003-07-04 04:11:31.000000000 -0400
-+++ src/linux/linux/drivers/block/blkpg.c	2004-05-31 02:18:03.000000000 -0400
+++ linux/drivers/block/blkpg.c	2004-05-31 02:18:03.000000000 -0400
@@ -34,7 +34,7 @@
 #include <linux/blk.h>			/* for set_device_ro() */
 #include <linux/blkpg.h>
@ -140,9 +140,9 @@ diff -Nurb src/linux/linux.orig/drivers/block/blkpg.c src/linux/linux/drivers/bl
 /*
  * Delete a partition given by partition number
  *
-diff -Nurb src/linux/linux.orig/fs/Config.in src/linux/linux/fs/Config.in
+diff -Nurb linux.orig/fs/Config.in linux/fs/Config.in
--- src/linux/linux.orig/fs/Config.in	2004-05-31 02:02:43.000000000 -0400
+--- linux.orig/fs/Config.in	2004-05-31 02:02:43.000000000 -0400
-+++ src/linux/linux/fs/Config.in	2004-05-31 02:18:03.000000000 -0400
+++ linux/fs/Config.in	2004-05-31 02:18:03.000000000 -0400
@@ -4,6 +4,12 @@
 mainmenu_option next_comment
 comment 'File systems'
@ -169,9 +169,9 @@ diff -Nurb src/linux/linux.orig/fs/Config.in src/linux/linux/fs/Config.in
    dep_tristate 'NFS server support' CONFIG_NFSD $CONFIG_INET
    dep_mbool '  Provide NFSv3 server support' CONFIG_NFSD_V3 $CONFIG_NFSD
-diff -Nurb src/linux/linux.orig/fs/Makefile src/linux/linux/fs/Makefile
+diff -Nurb linux.orig/fs/Makefile linux/fs/Makefile
--- src/linux/linux.orig/fs/Makefile	2004-05-31 02:02:42.000000000 -0400
+--- linux.orig/fs/Makefile	2004-05-31 02:02:42.000000000 -0400
-+++ src/linux/linux/fs/Makefile	2004-05-31 02:18:03.000000000 -0400
+++ linux/fs/Makefile	2004-05-31 02:18:03.000000000 -0400
@@ -8,7 +8,7 @@
 O_TARGET := fs.o
@ -189,9 +189,9 @@ diff -Nurb src/linux/linux.orig/fs/Makefile src/linux/linux/fs/Makefile
 obj-$(CONFIG_BINFMT_AOUT)	+= binfmt_aout.o
 obj-$(CONFIG_BINFMT_EM86)	+= binfmt_em86.o
-diff -Nurb src/linux/linux.orig/fs/blkdev_swap.c src/linux/linux/fs/blkdev_swap.c
+diff -Nurb linux.orig/fs/blkdev_swap.c linux/fs/blkdev_swap.c
--- src/linux/linux.orig/fs/blkdev_swap.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.orig/fs/blkdev_swap.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/fs/blkdev_swap.c	2004-05-31 02:18:03.000000000 -0400
+++ linux/fs/blkdev_swap.c	2004-05-31 02:18:03.000000000 -0400
@@ -0,0 +1,309 @@
 +/*
 + * Swapping to partitions or files located on partitions.
@ -502,9 +502,9 @@ diff -Nurb src/linux/linux.orig/fs/blkdev_swap.c src/linux/linux/fs/blkdev_swap.
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Many. Stuffed into a module by cH (Claus-Justus Heine)");
 +MODULE_DESCRIPTION("Swapping to partitions and files on local hard-disks");
-diff -Nurb src/linux/linux.orig/fs/buffer.c src/linux/linux/fs/buffer.c
+diff -Nurb linux.orig/fs/buffer.c linux/fs/buffer.c
--- src/linux/linux.orig/fs/buffer.c	2003-07-04 04:12:05.000000000 -0400
+--- linux.orig/fs/buffer.c	2003-07-04 04:12:05.000000000 -0400
-+++ src/linux/linux/fs/buffer.c	2004-05-31 02:21:05.000000000 -0400
+++ linux/fs/buffer.c	2004-05-31 02:21:05.000000000 -0400
@@ -743,7 +743,7 @@
 	bh->b_private = private;
 }
@ -550,9 +550,9 @@ diff -Nurb src/linux/linux.orig/fs/buffer.c src/linux/linux/fs/buffer.c
 int block_symlink(struct inode *inode, const char *symname, int len)
 {
 	struct address_space *mapping = inode->i_mapping;
-diff -Nurb src/linux/linux.orig/fs/nfs/Makefile src/linux/linux/fs/nfs/Makefile
+diff -Nurb linux.orig/fs/nfs/Makefile linux/fs/nfs/Makefile
--- src/linux/linux.orig/fs/nfs/Makefile	2003-07-04 04:12:07.000000000 -0400
+--- linux.orig/fs/nfs/Makefile	2003-07-04 04:12:07.000000000 -0400
-+++ src/linux/linux/fs/nfs/Makefile	2004-05-31 02:18:03.000000000 -0400
+++ linux/fs/nfs/Makefile	2004-05-31 02:18:03.000000000 -0400
@@ -15,6 +15,14 @@
 obj-$(CONFIG_ROOT_NFS) += nfsroot.o mount_clnt.o      
 obj-$(CONFIG_NFS_V3) += nfs3proc.o nfs3xdr.o
@ -569,9 +569,9 @@ diff -Nurb src/linux/linux.orig/fs/nfs/Makefile src/linux/linux/fs/nfs/Makefile
 +endif
 include $(TOPDIR)/Rules.make
-diff -Nurb src/linux/linux.orig/fs/nfs/file.c src/linux/linux/fs/nfs/file.c
+diff -Nurb linux.orig/fs/nfs/file.c linux/fs/nfs/file.c
--- src/linux/linux.orig/fs/nfs/file.c	2003-07-04 04:12:07.000000000 -0400
+--- linux.orig/fs/nfs/file.c	2003-07-04 04:12:07.000000000 -0400
-+++ src/linux/linux/fs/nfs/file.c	2004-05-31 02:18:03.000000000 -0400
+++ linux/fs/nfs/file.c	2004-05-31 02:18:03.000000000 -0400
@@ -58,11 +58,6 @@
 	setattr:	nfs_notify_change,
 };
@ -604,9 +604,9 @@ diff -Nurb src/linux/linux.orig/fs/nfs/file.c src/linux/linux/fs/nfs/file.c
 }
 /*
-diff -Nurb src/linux/linux.orig/fs/nfs/nfs_syms.c src/linux/linux/fs/nfs/nfs_syms.c
+diff -Nurb linux.orig/fs/nfs/nfs_syms.c linux/fs/nfs/nfs_syms.c
--- src/linux/linux.orig/fs/nfs/nfs_syms.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.orig/fs/nfs/nfs_syms.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/fs/nfs/nfs_syms.c	2004-05-31 02:18:03.000000000 -0400
+++ linux/fs/nfs/nfs_syms.c	2004-05-31 02:18:03.000000000 -0400
@@ -0,0 +1,10 @@
 +#include <linux/config.h>
 +#define __NO_VERSION__
@ -618,9 +618,9 @@ diff -Nurb src/linux/linux.orig/fs/nfs/nfs_syms.c src/linux/linux/fs/nfs/nfs_sym
 +EXPORT_SYMBOL(__nfs_refresh_inode);
 +EXPORT_SYMBOL(nfs_write_attributes);
 +
-diff -Nurb src/linux/linux.orig/fs/nfs/nfsswap.c src/linux/linux/fs/nfs/nfsswap.c
+diff -Nurb linux.orig/fs/nfs/nfsswap.c linux/fs/nfs/nfsswap.c
--- src/linux/linux.orig/fs/nfs/nfsswap.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.orig/fs/nfs/nfsswap.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/fs/nfs/nfsswap.c	2004-05-31 02:18:03.000000000 -0400
+++ linux/fs/nfs/nfsswap.c	2004-05-31 02:18:03.000000000 -0400
@@ -0,0 +1,350 @@
 +/*
 + * Swapping to files located on NFS mounted volumes
@ -972,9 +972,9 @@ diff -Nurb src/linux/linux.orig/fs/nfs/nfsswap.c src/linux/linux/fs/nfs/nfsswap.
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("(c) 1996-2002 cH (Claus-Justus Heine)");
 +MODULE_DESCRIPTION("Swapping to files located on volumes mounted via NFS");
-diff -Nurb src/linux/linux.orig/fs/nfs/read.c src/linux/linux/fs/nfs/read.c
+diff -Nurb linux.orig/fs/nfs/read.c linux/fs/nfs/read.c
--- src/linux/linux.orig/fs/nfs/read.c	2003-07-04 04:12:08.000000000 -0400
+--- linux.orig/fs/nfs/read.c	2003-07-04 04:12:08.000000000 -0400
-+++ src/linux/linux/fs/nfs/read.c	2004-05-31 02:18:03.000000000 -0400
+++ linux/fs/nfs/read.c	2004-05-31 02:18:03.000000000 -0400
@@ -50,11 +50,6 @@
  */
 static void	nfs_readpage_result(struct rpc_task *task);
@ -1022,9 +1022,9 @@ diff -Nurb src/linux/linux.orig/fs/nfs/read.c src/linux/linux/fs/nfs/read.c
 out:
 	return error;
-diff -Nurb src/linux/linux.orig/fs/nfs/write.c src/linux/linux/fs/nfs/write.c
+diff -Nurb linux.orig/fs/nfs/write.c linux/fs/nfs/write.c
--- src/linux/linux.orig/fs/nfs/write.c	2003-07-04 04:12:08.000000000 -0400
+--- linux.orig/fs/nfs/write.c	2003-07-04 04:12:08.000000000 -0400
-+++ src/linux/linux/fs/nfs/write.c	2004-05-31 02:20:47.000000000 -0400
+++ linux/fs/nfs/write.c	2004-05-31 02:20:47.000000000 -0400
@@ -3,7 +3,6 @@
 #include <linux/config.h>
 #include <linux/types.h>
@ -1122,9 +1122,9 @@ diff -Nurb src/linux/linux.orig/fs/nfs/write.c src/linux/linux/fs/nfs/write.c
 	while (!list_empty(&data->pages)) {
 		req = nfs_list_entry(data->pages.next);
 		nfs_list_remove_request(req);
-diff -Nurb src/linux/linux.orig/include/linux/fs.h src/linux/linux/include/linux/fs.h
+diff -Nurb linux.orig/include/linux/fs.h linux/include/linux/fs.h
--- src/linux/linux.orig/include/linux/fs.h	2004-05-31 02:06:19.000000000 -0400
+--- linux.orig/include/linux/fs.h	2004-05-31 02:06:19.000000000 -0400
-+++ src/linux/linux/include/linux/fs.h	2004-05-31 02:18:03.000000000 -0400
+++ linux/include/linux/fs.h	2004-05-31 02:18:03.000000000 -0400
@@ -1500,6 +1500,10 @@
 extern int inode_change_ok(struct inode *, struct iattr *);
 extern int inode_setattr(struct inode *, struct iattr *);
@ -1136,9 +1136,9 @@ diff -Nurb src/linux/linux.orig/include/linux/fs.h src/linux/linux/include/linux
 /*
  * Common dentry functions for inclusion in the VFS
  * or in other stackable file systems.  Some of these
-diff -Nurb src/linux/linux.orig/include/linux/nfs_fs.h src/linux/linux/include/linux/nfs_fs.h
+diff -Nurb linux.orig/include/linux/nfs_fs.h linux/include/linux/nfs_fs.h
--- src/linux/linux.orig/include/linux/nfs_fs.h	2004-05-31 02:06:28.000000000 -0400
+--- linux.orig/include/linux/nfs_fs.h	2004-05-31 02:06:28.000000000 -0400
-+++ src/linux/linux/include/linux/nfs_fs.h	2004-05-31 02:18:03.000000000 -0400
+++ linux/include/linux/nfs_fs.h	2004-05-31 02:18:03.000000000 -0400
@@ -40,8 +40,8 @@
  */
 #define NFS_MAX_DIRCACHE		16
@ -1167,9 +1167,9 @@ diff -Nurb src/linux/linux.orig/include/linux/nfs_fs.h src/linux/linux/include/l
 #define NFSDBG_ALL		0xFFFF
 #ifdef __KERNEL__
-diff -Nurb src/linux/linux.orig/include/linux/slab.h src/linux/linux/include/linux/slab.h
+diff -Nurb linux.orig/include/linux/slab.h linux/include/linux/slab.h
--- src/linux/linux.orig/include/linux/slab.h	2004-05-31 02:06:19.000000000 -0400
+--- linux.orig/include/linux/slab.h	2004-05-31 02:06:19.000000000 -0400
-+++ src/linux/linux/include/linux/slab.h	2004-05-31 02:18:03.000000000 -0400
+++ linux/include/linux/slab.h	2004-05-31 02:18:03.000000000 -0400
@@ -39,6 +39,7 @@
 #define	SLAB_HWCACHE_ALIGN	0x00002000UL	/* align objs on a h/w cache lines */
 #define SLAB_CACHE_DMA		0x00004000UL	/* use GFP_DMA memory */
@ -1178,9 +1178,9 @@ diff -Nurb src/linux/linux.orig/include/linux/slab.h src/linux/linux/include/lin
 /* flags passed to a constructor func */
 #define	SLAB_CTOR_CONSTRUCTOR	0x001UL		/* if not set, then deconstructor */
-diff -Nurb src/linux/linux.orig/include/linux/swap.h src/linux/linux/include/linux/swap.h
+diff -Nurb linux.orig/include/linux/swap.h linux/include/linux/swap.h
--- src/linux/linux.orig/include/linux/swap.h	2004-05-31 02:06:19.000000000 -0400
+--- linux.orig/include/linux/swap.h	2004-05-31 02:06:19.000000000 -0400
-+++ src/linux/linux/include/linux/swap.h	2004-05-31 02:18:03.000000000 -0400
+++ linux/include/linux/swap.h	2004-05-31 02:18:03.000000000 -0400
@@ -58,15 +58,29 @@
 #define SWAP_MAP_MAX	0x7fff
 #define SWAP_MAP_BAD	0x8000
@ -1233,9 +1233,9 @@ diff -Nurb src/linux/linux.orig/include/linux/swap.h src/linux/linux/include/lin
 extern int swap_duplicate(swp_entry_t);
 extern int swap_count(struct page *);
 extern int valid_swaphandles(swp_entry_t, unsigned long *);
-diff -Nurb src/linux/linux.orig/include/net/netswapping.h src/linux/linux/include/net/netswapping.h
+diff -Nurb linux.orig/include/net/netswapping.h linux/include/net/netswapping.h
--- src/linux/linux.orig/include/net/netswapping.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.orig/include/net/netswapping.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/net/netswapping.h	2004-05-31 02:18:03.000000000 -0400
+++ linux/include/net/netswapping.h	2004-05-31 02:18:03.000000000 -0400
@@ -0,0 +1,47 @@
 +#ifndef _LINUX_NETSWAPPING_H
 +#define _LINUX_NETSWAPPING_H
@ -1284,9 +1284,9 @@ diff -Nurb src/linux/linux.orig/include/net/netswapping.h src/linux/linux/includ
 +#endif
 +
 +#endif
-diff -Nurb src/linux/linux.orig/include/net/sock.h src/linux/linux/include/net/sock.h
+diff -Nurb linux.orig/include/net/sock.h linux/include/net/sock.h
--- src/linux/linux.orig/include/net/sock.h	2004-05-31 02:07:17.000000000 -0400
+--- linux.orig/include/net/sock.h	2004-05-31 02:07:17.000000000 -0400
-+++ src/linux/linux/include/net/sock.h	2004-05-31 02:18:03.000000000 -0400
+++ linux/include/net/sock.h	2004-05-31 02:18:03.000000000 -0400
@@ -103,6 +103,10 @@
 #include <linux/filter.h>
 #endif
@ -1323,9 +1323,9 @@ diff -Nurb src/linux/linux.orig/include/net/sock.h src/linux/linux/include/net/s
 	skb->dev = NULL;
 	skb_set_owner_r(skb, sk);
-diff -Nurb src/linux/linux.orig/kernel/ksyms.c src/linux/linux/kernel/ksyms.c
+diff -Nurb linux.orig/kernel/ksyms.c linux/kernel/ksyms.c
--- src/linux/linux.orig/kernel/ksyms.c	2004-05-31 02:02:43.000000000 -0400
+--- linux.orig/kernel/ksyms.c	2004-05-31 02:02:43.000000000 -0400
-+++ src/linux/linux/kernel/ksyms.c	2004-05-31 02:18:03.000000000 -0400
+++ linux/kernel/ksyms.c	2004-05-31 02:18:03.000000000 -0400
@@ -41,6 +41,7 @@
 #include <linux/mm.h>
 #include <linux/capability.h>
@ -1355,9 +1355,9 @@ diff -Nurb src/linux/linux.orig/kernel/ksyms.c src/linux/linux/kernel/ksyms.c
 EXPORT_SYMBOL(__inode_dir_notify);
 #ifdef CONFIG_UID16
-diff -Nurb src/linux/linux.orig/mm/page_io.c src/linux/linux/mm/page_io.c
+diff -Nurb linux.orig/mm/page_io.c linux/mm/page_io.c
--- src/linux/linux.orig/mm/page_io.c	2003-07-04 04:12:29.000000000 -0400
+--- linux.orig/mm/page_io.c	2003-07-04 04:12:29.000000000 -0400
-+++ src/linux/linux/mm/page_io.c	2004-05-31 02:18:03.000000000 -0400
+++ linux/mm/page_io.c	2004-05-31 02:18:03.000000000 -0400
@@ -36,11 +36,8 @@
 static int rw_swap_page_base(int rw, swp_entry_t entry, struct page *page)
 {
@ -1405,9 +1405,9 @@ diff -Nurb src/linux/linux.orig/mm/page_io.c src/linux/linux/mm/page_io.c
 	return 1;
 }
-diff -Nurb src/linux/linux.orig/mm/slab.c src/linux/linux/mm/slab.c
+diff -Nurb linux.orig/mm/slab.c linux/mm/slab.c
--- src/linux/linux.orig/mm/slab.c	2003-07-04 04:12:29.000000000 -0400
+--- linux.orig/mm/slab.c	2003-07-04 04:12:29.000000000 -0400
-+++ src/linux/linux/mm/slab.c	2004-05-31 02:18:03.000000000 -0400
+++ linux/mm/slab.c	2004-05-31 02:18:03.000000000 -0400
@@ -111,10 +111,12 @@
 # define CREATE_MASK	(SLAB_DEBUG_INITIAL | SLAB_RED_ZONE | \
 			 SLAB_POISON | SLAB_HWCACHE_ALIGN | \
@ -1462,9 +1462,9 @@ diff -Nurb src/linux/linux.orig/mm/slab.c src/linux/linux/mm/slab.c
 		if (flags & CFLGS_OFF_SLAB && cachep->num > offslab_limit) {
 			/* Oops, this num of objs will cause problems. */
 			cachep->gfporder--;
-diff -Nurb src/linux/linux.orig/mm/swapfile.c src/linux/linux/mm/swapfile.c
+diff -Nurb linux.orig/mm/swapfile.c linux/mm/swapfile.c
--- src/linux/linux.orig/mm/swapfile.c	2003-07-04 04:12:29.000000000 -0400
+--- linux.orig/mm/swapfile.c	2003-07-04 04:12:29.000000000 -0400
-+++ src/linux/linux/mm/swapfile.c	2004-05-31 02:18:03.000000000 -0400
+++ linux/mm/swapfile.c	2004-05-31 02:18:03.000000000 -0400
@@ -11,12 +11,17 @@
 #include <linux/swap.h>
 #include <linux/swapctl.h>
@ -1953,9 +1953,9 @@ diff -Nurb src/linux/linux.orig/mm/swapfile.c src/linux/linux/mm/swapfile.c
 }
 /*
-diff -Nurb src/linux/linux.orig/net/Config.in src/linux/linux/net/Config.in
+diff -Nurb linux.orig/net/Config.in linux/net/Config.in
--- src/linux/linux.orig/net/Config.in	2003-07-04 04:12:29.000000000 -0400
+--- linux.orig/net/Config.in	2003-07-04 04:12:29.000000000 -0400
-+++ src/linux/linux/net/Config.in	2004-05-31 02:18:03.000000000 -0400
+++ linux/net/Config.in	2004-05-31 02:18:03.000000000 -0400
@@ -16,6 +16,9 @@
 fi
 bool 'Socket Filtering'  CONFIG_FILTER
@ -1966,9 +1966,9 @@ diff -Nurb src/linux/linux.orig/net/Config.in src/linux/linux/net/Config.in
 bool 'TCP/IP networking' CONFIG_INET
 if [ "$CONFIG_INET" = "y" ]; then
    source net/ipv4/Config.in
-diff -Nurb src/linux/linux.orig/net/Makefile src/linux/linux/net/Makefile
+diff -Nurb linux.orig/net/Makefile linux/net/Makefile
--- src/linux/linux.orig/net/Makefile	2003-07-04 04:12:29.000000000 -0400
+--- linux.orig/net/Makefile	2003-07-04 04:12:29.000000000 -0400
-+++ src/linux/linux/net/Makefile	2004-05-31 02:18:03.000000000 -0400
+++ linux/net/Makefile	2004-05-31 02:18:03.000000000 -0400
@@ -51,6 +51,7 @@
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_MODULES)		+= netsyms.o
@ -1977,9 +1977,9 @@ diff -Nurb src/linux/linux.orig/net/Makefile src/linux/linux/net/Makefile
 endif
 include $(TOPDIR)/Rules.make
-diff -Nurb src/linux/linux.orig/net/core/sock.c src/linux/linux/net/core/sock.c
+diff -Nurb linux.orig/net/core/sock.c linux/net/core/sock.c
--- src/linux/linux.orig/net/core/sock.c	2003-10-14 04:09:32.000000000 -0400
+--- linux.orig/net/core/sock.c	2003-10-14 04:09:32.000000000 -0400
-+++ src/linux/linux/net/core/sock.c	2004-05-31 02:18:03.000000000 -0400
+++ linux/net/core/sock.c	2004-05-31 02:18:03.000000000 -0400
@@ -402,6 +402,21 @@
 			ret = -ENONET;
 			break;
@ -2015,9 +2015,9 @@ diff -Nurb src/linux/linux.orig/net/core/sock.c src/linux/linux/net/core/sock.c
 		/* Dubious BSD thing... Probably nobody even uses it, but
 		 * the UNIX standard wants it for whatever reason... -DaveM
 		 */
-diff -Nurb src/linux/linux.orig/net/ipv4/tcp_ipv4.c src/linux/linux/net/ipv4/tcp_ipv4.c
+diff -Nurb linux.orig/net/ipv4/tcp_ipv4.c linux/net/ipv4/tcp_ipv4.c
--- src/linux/linux.orig/net/ipv4/tcp_ipv4.c	2003-10-14 04:09:33.000000000 -0400
+--- linux.orig/net/ipv4/tcp_ipv4.c	2003-10-14 04:09:33.000000000 -0400
-+++ src/linux/linux/net/ipv4/tcp_ipv4.c	2004-05-31 02:18:03.000000000 -0400
+++ linux/net/ipv4/tcp_ipv4.c	2004-05-31 02:18:03.000000000 -0400
@@ -1657,6 +1657,12 @@
 	if (filter && sk_filter(skb, filter))
 		goto discard;
@ -2031,9 +2031,9 @@ diff -Nurb src/linux/linux.orig/net/ipv4/tcp_ipv4.c src/linux/linux/net/ipv4/tcp
   	IP_INC_STATS_BH(IpInDelivers);
-diff -Nurb src/linux/linux.orig/net/ipv6/tcp_ipv6.c src/linux/linux/net/ipv6/tcp_ipv6.c
+diff -Nurb linux.orig/net/ipv6/tcp_ipv6.c linux/net/ipv6/tcp_ipv6.c
--- src/linux/linux.orig/net/ipv6/tcp_ipv6.c	2003-10-14 04:09:34.000000000 -0400
+--- linux.orig/net/ipv6/tcp_ipv6.c	2003-10-14 04:09:34.000000000 -0400
-+++ src/linux/linux/net/ipv6/tcp_ipv6.c	2004-05-31 02:18:03.000000000 -0400
+++ linux/net/ipv6/tcp_ipv6.c	2004-05-31 02:18:03.000000000 -0400
@@ -1424,6 +1424,12 @@
 	if (filter && sk_filter(skb, filter))
 		goto discard;
@ -2047,9 +2047,9 @@ diff -Nurb src/linux/linux.orig/net/ipv6/tcp_ipv6.c src/linux/linux/net/ipv6/tcp
 	/*
 	 *	socket locking is here for SMP purposes as backlog rcv
-diff -Nurb src/linux/linux.orig/net/netswapping.c src/linux/linux/net/netswapping.c
+diff -Nurb linux.orig/net/netswapping.c linux/net/netswapping.c
--- src/linux/linux.orig/net/netswapping.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.orig/net/netswapping.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/netswapping.c	2004-05-31 02:18:03.000000000 -0400
+++ linux/net/netswapping.c	2004-05-31 02:18:03.000000000 -0400
@@ -0,0 +1,76 @@
 +/*
 + * linux/net/swapping.c
@ -2127,9 +2127,9 @@ diff -Nurb src/linux/linux.orig/net/netswapping.c src/linux/linux/net/netswappin
 +
 +module_init(netswap_init)
 +module_exit(netswap_exit)
-diff -Nurb src/linux/linux.orig/net/netsyms.c src/linux/linux/net/netsyms.c
+diff -Nurb linux.orig/net/netsyms.c linux/net/netsyms.c
--- src/linux/linux.orig/net/netsyms.c	2004-05-31 02:02:49.000000000 -0400
+--- linux.orig/net/netsyms.c	2004-05-31 02:02:49.000000000 -0400
-+++ src/linux/linux/net/netsyms.c	2004-05-31 02:18:03.000000000 -0400
+++ linux/net/netsyms.c	2004-05-31 02:18:03.000000000 -0400
@@ -601,4 +601,10 @@
 EXPORT_SYMBOL(wireless_send_event);
 #endif /* CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO */
@ -2141,9 +2141,9 @@ diff -Nurb src/linux/linux.orig/net/netsyms.c src/linux/linux/net/netsyms.c
 +#endif
 +
 #endif  /* CONFIG_NET */
-diff -Nurb src/linux/linux.orig/net/packet/af_packet.c src/linux/linux/net/packet/af_packet.c
+diff -Nurb linux.orig/net/packet/af_packet.c linux/net/packet/af_packet.c
--- src/linux/linux.orig/net/packet/af_packet.c	2003-10-14 04:09:35.000000000 -0400
+--- linux.orig/net/packet/af_packet.c	2003-10-14 04:09:35.000000000 -0400
-+++ src/linux/linux/net/packet/af_packet.c	2004-05-31 02:18:03.000000000 -0400
+++ linux/net/packet/af_packet.c	2004-05-31 02:18:03.000000000 -0400
@@ -449,6 +449,12 @@
 			snaplen = res;
 	}
@ -2179,9 +2179,9 @@ diff -Nurb src/linux/linux.orig/net/packet/af_packet.c src/linux/linux/net/packe
 	if (sk->type == SOCK_DGRAM) {
 		macoff = netoff = TPACKET_ALIGN(TPACKET_HDRLEN) + 16;
-diff -Nurb src/linux/linux.orig/net/sunrpc/sched.c src/linux/linux/net/sunrpc/sched.c
+diff -Nurb linux.orig/net/sunrpc/sched.c linux/net/sunrpc/sched.c
--- src/linux/linux.orig/net/sunrpc/sched.c	2003-07-04 04:12:33.000000000 -0400
+--- linux.orig/net/sunrpc/sched.c	2003-07-04 04:12:33.000000000 -0400
-+++ src/linux/linux/net/sunrpc/sched.c	2004-05-31 02:18:03.000000000 -0400
+++ linux/net/sunrpc/sched.c	2004-05-31 02:18:03.000000000 -0400
@@ -79,10 +79,11 @@
  */
 static spinlock_t rpc_sched_lock = SPIN_LOCK_UNLOCKED;
@ -2329,9 +2329,9 @@ diff -Nurb src/linux/linux.orig/net/sunrpc/sched.c src/linux/linux/net/sunrpc/sc
 }
 /*
-diff -Nurb src/linux/linux.orig/net/sunrpc/xprt.c src/linux/linux/net/sunrpc/xprt.c
+diff -Nurb linux.orig/net/sunrpc/xprt.c linux/net/sunrpc/xprt.c
--- src/linux/linux.orig/net/sunrpc/xprt.c	2003-07-04 04:12:33.000000000 -0400
+--- linux.orig/net/sunrpc/xprt.c	2003-07-04 04:12:33.000000000 -0400
-+++ src/linux/linux/net/sunrpc/xprt.c	2004-05-31 02:18:03.000000000 -0400
+++ linux/net/sunrpc/xprt.c	2004-05-31 02:18:03.000000000 -0400
@@ -139,7 +139,7 @@
 __xprt_lock_write(struct rpc_xprt *xprt, struct rpc_task *task)
 {
--- a/obsolete-buildroot/sources/openwrt/kernel/patches/140-ebtables-brnf-5.patch
+++ b/obsolete-buildroot/sources/openwrt/kernel/patches/140-ebtables-brnf-5.patch
@ -1,6 +1,6 @@
-diff -Nurb src/linux/linux.stock/include/linux/if_bridge.h src/linux/linux/include/linux/if_bridge.h
+diff -Nurb linux.stock/include/linux/if_bridge.h linux/include/linux/if_bridge.h
--- src/linux/linux.stock/include/linux/if_bridge.h	2003-10-14 04:09:25.000000000 -0400
+--- linux.stock/include/linux/if_bridge.h	2003-10-14 04:09:25.000000000 -0400
-+++ src/linux/linux/include/linux/if_bridge.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/if_bridge.h	2004-07-10 23:46:39.000000000 -0400
@@ -102,7 +102,8 @@
 struct net_bridge_port;
@ -11,9 +11,9 @@ diff -Nurb src/linux/linux.stock/include/linux/if_bridge.h src/linux/linux/inclu
 #endif
-diff -Nurb src/linux/linux.stock/include/linux/netfilter.h src/linux/linux/include/linux/netfilter.h
+diff -Nurb linux.stock/include/linux/netfilter.h linux/include/linux/netfilter.h
--- src/linux/linux.stock/include/linux/netfilter.h	2004-07-10 23:30:09.000000000 -0400
+--- linux.stock/include/linux/netfilter.h	2004-07-10 23:30:09.000000000 -0400
-+++ src/linux/linux/include/linux/netfilter.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter.h	2004-07-10 23:46:39.000000000 -0400
@@ -119,17 +119,23 @@
 /* This is gross, but inline doesn't cut it for avoiding the function
    call in fast path: gcc doesn't inline (needs value tracking?). --RR */
@ -41,9 +41,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter.h src/linux/linux/inclu
 /* Call setsockopt() */
 int nf_setsockopt(struct sock *sk, int pf, int optval, char *opt, 
-diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_802_3.h src/linux/linux/include/linux/netfilter_bridge/ebt_802_3.h
+diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_802_3.h linux/include/linux/netfilter_bridge/ebt_802_3.h
--- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_802_3.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/include/linux/netfilter_bridge/ebt_802_3.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/netfilter_bridge/ebt_802_3.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter_bridge/ebt_802_3.h	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,60 @@
 +#ifndef __LINUX_BRIDGE_EBT_802_3_H
 +#define __LINUX_BRIDGE_EBT_802_3_H
@ -105,9 +105,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_802_3.h src/
 +};
 +
 +#endif
-diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_among.h src/linux/linux/include/linux/netfilter_bridge/ebt_among.h
+diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_among.h linux/include/linux/netfilter_bridge/ebt_among.h
--- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_among.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/include/linux/netfilter_bridge/ebt_among.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/netfilter_bridge/ebt_among.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter_bridge/ebt_among.h	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,65 @@
 +#ifndef __LINUX_BRIDGE_EBT_AMONG_H
 +#define __LINUX_BRIDGE_EBT_AMONG_H
@ -174,9 +174,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_among.h src/
 +#define EBT_AMONG_MATCH "among"
 +
 +#endif
-diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_arp.h src/linux/linux/include/linux/netfilter_bridge/ebt_arp.h
+diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_arp.h linux/include/linux/netfilter_bridge/ebt_arp.h
--- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_arp.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/include/linux/netfilter_bridge/ebt_arp.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/netfilter_bridge/ebt_arp.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter_bridge/ebt_arp.h	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,32 @@
 +#ifndef __LINUX_BRIDGE_EBT_ARP_H
 +#define __LINUX_BRIDGE_EBT_ARP_H
@ -210,9 +210,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_arp.h src/li
 +};
 +
 +#endif
-diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_arpreply.h src/linux/linux/include/linux/netfilter_bridge/ebt_arpreply.h
+diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_arpreply.h linux/include/linux/netfilter_bridge/ebt_arpreply.h
--- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_arpreply.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/include/linux/netfilter_bridge/ebt_arpreply.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/netfilter_bridge/ebt_arpreply.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter_bridge/ebt_arpreply.h	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,11 @@
 +#ifndef __LINUX_BRIDGE_EBT_ARPREPLY_H
 +#define __LINUX_BRIDGE_EBT_ARPREPLY_H
@ -225,9 +225,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_arpreply.h s
 +#define EBT_ARPREPLY_TARGET "arpreply"
 +
 +#endif
-diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_ip.h src/linux/linux/include/linux/netfilter_bridge/ebt_ip.h
+diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_ip.h linux/include/linux/netfilter_bridge/ebt_ip.h
--- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_ip.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/include/linux/netfilter_bridge/ebt_ip.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/netfilter_bridge/ebt_ip.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter_bridge/ebt_ip.h	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,43 @@
 +/*
 + *  ebt_ip
@ -272,9 +272,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_ip.h src/lin
 +};
 +
 +#endif
-diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_limit.h src/linux/linux/include/linux/netfilter_bridge/ebt_limit.h
+diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_limit.h linux/include/linux/netfilter_bridge/ebt_limit.h
--- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_limit.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/include/linux/netfilter_bridge/ebt_limit.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/netfilter_bridge/ebt_limit.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter_bridge/ebt_limit.h	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,23 @@
 +#ifndef __LINUX_BRIDGE_EBT_LIMIT_H
 +#define __LINUX_BRIDGE_EBT_LIMIT_H
@ -299,9 +299,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_limit.h src/
 +};
 +
 +#endif
-diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_log.h src/linux/linux/include/linux/netfilter_bridge/ebt_log.h
+diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_log.h linux/include/linux/netfilter_bridge/ebt_log.h
--- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_log.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/include/linux/netfilter_bridge/ebt_log.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/netfilter_bridge/ebt_log.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter_bridge/ebt_log.h	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,17 @@
 +#ifndef __LINUX_BRIDGE_EBT_LOG_H
 +#define __LINUX_BRIDGE_EBT_LOG_H
@ -320,9 +320,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_log.h src/li
 +};
 +
 +#endif
-diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_mark_m.h src/linux/linux/include/linux/netfilter_bridge/ebt_mark_m.h
+diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_mark_m.h linux/include/linux/netfilter_bridge/ebt_mark_m.h
--- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_mark_m.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/include/linux/netfilter_bridge/ebt_mark_m.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/netfilter_bridge/ebt_mark_m.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter_bridge/ebt_mark_m.h	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,15 @@
 +#ifndef __LINUX_BRIDGE_EBT_MARK_M_H
 +#define __LINUX_BRIDGE_EBT_MARK_M_H
@ -339,9 +339,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_mark_m.h src
 +#define EBT_MARK_MATCH "mark_m"
 +
 +#endif
-diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_mark_t.h src/linux/linux/include/linux/netfilter_bridge/ebt_mark_t.h
+diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_mark_t.h linux/include/linux/netfilter_bridge/ebt_mark_t.h
--- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_mark_t.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/include/linux/netfilter_bridge/ebt_mark_t.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/netfilter_bridge/ebt_mark_t.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter_bridge/ebt_mark_t.h	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,12 @@
 +#ifndef __LINUX_BRIDGE_EBT_MARK_T_H
 +#define __LINUX_BRIDGE_EBT_MARK_T_H
@ -355,9 +355,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_mark_t.h src
 +#define EBT_MARK_TARGET "mark"
 +
 +#endif
-diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_nat.h src/linux/linux/include/linux/netfilter_bridge/ebt_nat.h
+diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_nat.h linux/include/linux/netfilter_bridge/ebt_nat.h
--- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_nat.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/include/linux/netfilter_bridge/ebt_nat.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/netfilter_bridge/ebt_nat.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter_bridge/ebt_nat.h	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,13 @@
 +#ifndef __LINUX_BRIDGE_EBT_NAT_H
 +#define __LINUX_BRIDGE_EBT_NAT_H
@ -372,9 +372,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_nat.h src/li
 +#define EBT_DNAT_TARGET "dnat"
 +
 +#endif
-diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_pkttype.h src/linux/linux/include/linux/netfilter_bridge/ebt_pkttype.h
+diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_pkttype.h linux/include/linux/netfilter_bridge/ebt_pkttype.h
--- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_pkttype.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/include/linux/netfilter_bridge/ebt_pkttype.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/netfilter_bridge/ebt_pkttype.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter_bridge/ebt_pkttype.h	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,11 @@
 +#ifndef __LINUX_BRIDGE_EBT_PKTTYPE_H
 +#define __LINUX_BRIDGE_EBT_PKTTYPE_H
@ -387,9 +387,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_pkttype.h sr
 +#define EBT_PKTTYPE_MATCH "pkttype"
 +
 +#endif
-diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_redirect.h src/linux/linux/include/linux/netfilter_bridge/ebt_redirect.h
+diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_redirect.h linux/include/linux/netfilter_bridge/ebt_redirect.h
--- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_redirect.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/include/linux/netfilter_bridge/ebt_redirect.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/netfilter_bridge/ebt_redirect.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter_bridge/ebt_redirect.h	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,11 @@
 +#ifndef __LINUX_BRIDGE_EBT_REDIRECT_H
 +#define __LINUX_BRIDGE_EBT_REDIRECT_H
@ -402,9 +402,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_redirect.h s
 +#define EBT_REDIRECT_TARGET "redirect"
 +
 +#endif
-diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_stp.h src/linux/linux/include/linux/netfilter_bridge/ebt_stp.h
+diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_stp.h linux/include/linux/netfilter_bridge/ebt_stp.h
--- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_stp.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/include/linux/netfilter_bridge/ebt_stp.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/netfilter_bridge/ebt_stp.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter_bridge/ebt_stp.h	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,46 @@
 +#ifndef __LINUX_BRIDGE_EBT_STP_H
 +#define __LINUX_BRIDGE_EBT_STP_H
@ -452,9 +452,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_stp.h src/li
 +};
 +
 +#endif
-diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_vlan.h src/linux/linux/include/linux/netfilter_bridge/ebt_vlan.h
+diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_vlan.h linux/include/linux/netfilter_bridge/ebt_vlan.h
--- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_vlan.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/include/linux/netfilter_bridge/ebt_vlan.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/netfilter_bridge/ebt_vlan.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter_bridge/ebt_vlan.h	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,20 @@
 +#ifndef __LINUX_BRIDGE_EBT_VLAN_H
 +#define __LINUX_BRIDGE_EBT_VLAN_H
@ -476,9 +476,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_vlan.h src/l
 +};
 +
 +#endif
-diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebtables.h src/linux/linux/include/linux/netfilter_bridge/ebtables.h
+diff -Nurb linux.stock/include/linux/netfilter_bridge/ebtables.h linux/include/linux/netfilter_bridge/ebtables.h
--- src/linux/linux.stock/include/linux/netfilter_bridge/ebtables.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/include/linux/netfilter_bridge/ebtables.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/netfilter_bridge/ebtables.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter_bridge/ebtables.h	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,361 @@
 +/*
 + *  ebtables
@ -841,9 +841,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebtables.h src/l
 +})
 +
 +#endif
-diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge.h src/linux/linux/include/linux/netfilter_bridge.h
+diff -Nurb linux.stock/include/linux/netfilter_bridge.h linux/include/linux/netfilter_bridge.h
--- src/linux/linux.stock/include/linux/netfilter_bridge.h	2003-07-04 04:12:26.000000000 -0400
+--- linux.stock/include/linux/netfilter_bridge.h	2003-07-04 04:12:26.000000000 -0400
-+++ src/linux/linux/include/linux/netfilter_bridge.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter_bridge.h	2004-07-10 23:46:39.000000000 -0400
@@ -6,6 +6,10 @@
 #include <linux/config.h>
@ -933,9 +933,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge.h src/linux/linu
 +#endif /* __KERNEL__ */
 #endif
-diff -Nurb src/linux/linux.stock/include/linux/netfilter_ipv4/ipt_physdev.h src/linux/linux/include/linux/netfilter_ipv4/ipt_physdev.h
+diff -Nurb linux.stock/include/linux/netfilter_ipv4/ipt_physdev.h linux/include/linux/netfilter_ipv4/ipt_physdev.h
--- src/linux/linux.stock/include/linux/netfilter_ipv4/ipt_physdev.h	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/include/linux/netfilter_ipv4/ipt_physdev.h	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/include/linux/netfilter_ipv4/ipt_physdev.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter_ipv4/ipt_physdev.h	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,24 @@
 +#ifndef _IPT_PHYSDEV_H
 +#define _IPT_PHYSDEV_H
@ -961,9 +961,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter_ipv4/ipt_physdev.h src/
 +};
 +
 +#endif /*_IPT_PHYSDEV_H*/
-diff -Nurb src/linux/linux.stock/include/linux/netfilter_ipv4.h src/linux/linux/include/linux/netfilter_ipv4.h
+diff -Nurb linux.stock/include/linux/netfilter_ipv4.h linux/include/linux/netfilter_ipv4.h
--- src/linux/linux.stock/include/linux/netfilter_ipv4.h	2004-07-10 23:30:09.000000000 -0400
+--- linux.stock/include/linux/netfilter_ipv4.h	2004-07-10 23:30:09.000000000 -0400
-+++ src/linux/linux/include/linux/netfilter_ipv4.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/netfilter_ipv4.h	2004-07-10 23:46:39.000000000 -0400
@@ -54,8 +54,10 @@
 	NF_IP_PRI_CONNTRACK_DEFRAG = -400,
 	NF_IP_PRI_RAW = -300,
@ -975,9 +975,9 @@ diff -Nurb src/linux/linux.stock/include/linux/netfilter_ipv4.h src/linux/linux/
 	NF_IP_PRI_FILTER = 0,
 	NF_IP_PRI_NAT_SRC = 100,
 	NF_IP_PRI_LAST = INT_MAX,
-diff -Nurb src/linux/linux.stock/include/linux/skbuff.h src/linux/linux/include/linux/skbuff.h
+diff -Nurb linux.stock/include/linux/skbuff.h linux/include/linux/skbuff.h
--- src/linux/linux.stock/include/linux/skbuff.h	2003-07-04 04:12:26.000000000 -0400
+--- linux.stock/include/linux/skbuff.h	2003-07-04 04:12:26.000000000 -0400
-+++ src/linux/linux/include/linux/skbuff.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/skbuff.h	2004-07-10 23:46:39.000000000 -0400
@@ -92,6 +92,20 @@
 struct nf_ct_info {
 	struct nf_conntrack *master;
@ -1030,9 +1030,9 @@ diff -Nurb src/linux/linux.stock/include/linux/skbuff.h src/linux/linux/include/
 #endif
 #endif	/* __KERNEL__ */
-diff -Nurb src/linux/linux.stock/include/linux/sysctl.h src/linux/linux/include/linux/sysctl.h
+diff -Nurb linux.stock/include/linux/sysctl.h linux/include/linux/sysctl.h
--- src/linux/linux.stock/include/linux/sysctl.h	2004-07-10 23:29:55.000000000 -0400
+--- linux.stock/include/linux/sysctl.h	2004-07-10 23:29:55.000000000 -0400
-+++ src/linux/linux/include/linux/sysctl.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/include/linux/sysctl.h	2004-07-10 23:46:39.000000000 -0400
@@ -547,6 +547,15 @@
 	NET_DECNET_CONF_DEV_STATE = 7
 };
@ -1049,9 +1049,9 @@ diff -Nurb src/linux/linux.stock/include/linux/sysctl.h src/linux/linux/include/
 /* CTL_PROC names: */
 /* CTL_FS names: */
-diff -Nurb src/linux/linux.stock/net/8021q/vlan_dev.c src/linux/linux/net/8021q/vlan_dev.c
+diff -Nurb linux.stock/net/8021q/vlan_dev.c linux/net/8021q/vlan_dev.c
--- src/linux/linux.stock/net/8021q/vlan_dev.c	2003-07-04 04:12:29.000000000 -0400
+--- linux.stock/net/8021q/vlan_dev.c	2003-07-04 04:12:29.000000000 -0400
-+++ src/linux/linux/net/8021q/vlan_dev.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/8021q/vlan_dev.c	2004-07-10 23:46:39.000000000 -0400
@@ -503,6 +503,10 @@
 	stats->tx_packets++; /* for statics only */
 	stats->tx_bytes += skb->len;
@ -1063,9 +1063,9 @@ diff -Nurb src/linux/linux.stock/net/8021q/vlan_dev.c src/linux/linux/net/8021q/
 	dev_queue_xmit(skb);
 	return 0;
-diff -Nurb src/linux/linux.stock/net/Config.in src/linux/linux/net/Config.in
+diff -Nurb linux.stock/net/Config.in linux/net/Config.in
--- src/linux/linux.stock/net/Config.in	2004-07-10 23:29:49.000000000 -0400
+--- linux.stock/net/Config.in	2004-07-10 23:29:49.000000000 -0400
-+++ src/linux/linux/net/Config.in	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/Config.in	2004-07-10 23:46:39.000000000 -0400
@@ -68,6 +68,9 @@
    source net/decnet/Config.in
 fi
@ -1076,9 +1076,9 @@ diff -Nurb src/linux/linux.stock/net/Config.in src/linux/linux/net/Config.in
 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
    tristate 'CCITT X.25 Packet Layer (EXPERIMENTAL)' CONFIG_X25
    tristate 'LAPB Data Link Driver (EXPERIMENTAL)' CONFIG_LAPB
-diff -Nurb src/linux/linux.stock/net/Makefile src/linux/linux/net/Makefile
+diff -Nurb linux.stock/net/Makefile linux/net/Makefile
--- src/linux/linux.stock/net/Makefile	2004-07-10 23:29:49.000000000 -0400
+--- linux.stock/net/Makefile	2004-07-10 23:29:49.000000000 -0400
-+++ src/linux/linux/net/Makefile	2004-07-10 23:49:10.000000000 -0400
+++ linux/net/Makefile	2004-07-10 23:49:10.000000000 -0400
@@ -26,6 +26,12 @@
 endif
 endif
@ -1092,9 +1092,9 @@ diff -Nurb src/linux/linux.stock/net/Makefile src/linux/linux/net/Makefile
 subdir-$(CONFIG_KHTTPD)		+= khttpd
 subdir-$(CONFIG_PACKET)		+= packet
 subdir-$(CONFIG_NET_SCHED)	+= sched
-diff -Nurb src/linux/linux.stock/net/bridge/Makefile src/linux/linux/net/bridge/Makefile
+diff -Nurb linux.stock/net/bridge/Makefile linux/net/bridge/Makefile
--- src/linux/linux.stock/net/bridge/Makefile	2003-07-04 04:12:30.000000000 -0400
+--- linux.stock/net/bridge/Makefile	2003-07-04 04:12:30.000000000 -0400
-+++ src/linux/linux/net/bridge/Makefile	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/Makefile	2004-07-10 23:46:39.000000000 -0400
@@ -7,10 +7,17 @@
 #
 # Note 2! The CFLAGS definition is now in the main makefile...
@ -1113,9 +1113,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/Makefile src/linux/linux/net/bridge/
 obj-m		:= $(O_TARGET)
 include $(TOPDIR)/Rules.make
-diff -Nurb src/linux/linux.stock/net/bridge/br.c src/linux/linux/net/bridge/br.c
+diff -Nurb linux.stock/net/bridge/br.c linux/net/bridge/br.c
--- src/linux/linux.stock/net/bridge/br.c	2003-10-14 04:09:32.000000000 -0400
+--- linux.stock/net/bridge/br.c	2003-10-14 04:09:32.000000000 -0400
-+++ src/linux/linux/net/bridge/br.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/br.c	2004-07-10 23:46:39.000000000 -0400
@@ -29,6 +29,8 @@
 #include "../atm/lec.h"
 #endif
@ -1155,9 +1155,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/br.c src/linux/linux/net/bridge/br.c
 module_init(br_init)
 module_exit(br_deinit)
-diff -Nurb src/linux/linux.stock/net/bridge/br_forward.c src/linux/linux/net/bridge/br_forward.c
+diff -Nurb linux.stock/net/bridge/br_forward.c linux/net/bridge/br_forward.c
--- src/linux/linux.stock/net/bridge/br_forward.c	2003-10-14 04:09:32.000000000 -0400
+--- linux.stock/net/bridge/br_forward.c	2003-10-14 04:09:32.000000000 -0400
-+++ src/linux/linux/net/bridge/br_forward.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/br_forward.c	2004-07-10 23:46:39.000000000 -0400
@@ -30,18 +30,21 @@
 	return 1;
 }
@ -1205,9 +1205,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/br_forward.c src/linux/linux/net/bri
 }
 /* called under bridge lock */
-diff -Nurb src/linux/linux.stock/net/bridge/br_input.c src/linux/linux/net/bridge/br_input.c
+diff -Nurb linux.stock/net/bridge/br_input.c linux/net/bridge/br_input.c
--- src/linux/linux.stock/net/bridge/br_input.c	2003-10-14 04:09:32.000000000 -0400
+--- linux.stock/net/bridge/br_input.c	2003-10-14 04:09:32.000000000 -0400
-+++ src/linux/linux/net/bridge/br_input.c	2004-07-10 23:48:36.000000000 -0400
+++ linux/net/bridge/br_input.c	2004-07-10 23:48:36.000000000 -0400
@@ -24,6 +24,9 @@
 static int br_pass_frame_up_finish(struct sk_buff *skb)
@ -1274,9 +1274,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/br_input.c src/linux/linux/net/bridg
 	kfree_skb(skb);
 +	return 0;
 }
-diff -Nurb src/linux/linux.stock/net/bridge/br_netfilter.c src/linux/linux/net/bridge/br_netfilter.c
+diff -Nurb linux.stock/net/bridge/br_netfilter.c linux/net/bridge/br_netfilter.c
--- src/linux/linux.stock/net/bridge/br_netfilter.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/br_netfilter.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/br_netfilter.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/br_netfilter.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,896 @@
 +/*
 + *	Handle firewalling
@ -2174,9 +2174,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/br_netfilter.c src/linux/linux/net/b
 +#endif
 +
 +}
-diff -Nurb src/linux/linux.stock/net/bridge/br_private.h src/linux/linux/net/bridge/br_private.h
+diff -Nurb linux.stock/net/bridge/br_private.h linux/net/bridge/br_private.h
--- src/linux/linux.stock/net/bridge/br_private.h	2003-10-14 04:09:32.000000000 -0400
+--- linux.stock/net/bridge/br_private.h	2003-10-14 04:09:32.000000000 -0400
-+++ src/linux/linux/net/bridge/br_private.h	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/br_private.h	2004-07-10 23:46:39.000000000 -0400
@@ -145,8 +145,10 @@
 /* br_forward.c */
 extern void br_deliver(struct net_bridge_port *to,
@ -2209,9 +2209,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/br_private.h src/linux/linux/net/bri
 /* br_stp.c */
 extern int br_is_root_bridge(struct net_bridge *br);
 extern struct net_bridge_port *br_get_port(struct net_bridge *br,
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/Config.in src/linux/linux/net/bridge/netfilter/Config.in
+diff -Nurb linux.stock/net/bridge/netfilter/Config.in linux/net/bridge/netfilter/Config.in
--- src/linux/linux.stock/net/bridge/netfilter/Config.in	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/Config.in	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/Config.in	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/Config.in	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,22 @@
 +#
 +# Bridge netfilter configuration
@ -2235,9 +2235,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/Config.in src/linux/linux/
 +dep_tristate '    ebt: dnat target support' CONFIG_BRIDGE_EBT_DNAT $CONFIG_BRIDGE_NF_EBTABLES
 +dep_tristate '    ebt: redirect target support' CONFIG_BRIDGE_EBT_REDIRECT $CONFIG_BRIDGE_NF_EBTABLES
 +dep_tristate '    ebt: mark target support' CONFIG_BRIDGE_EBT_MARK_T $CONFIG_BRIDGE_NF_EBTABLES
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/Makefile src/linux/linux/net/bridge/netfilter/Makefile
+diff -Nurb linux.stock/net/bridge/netfilter/Makefile linux/net/bridge/netfilter/Makefile
--- src/linux/linux.stock/net/bridge/netfilter/Makefile	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/Makefile	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/Makefile	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,33 @@
 +#
 +# Makefile for the netfilter modules on top of bridging.
@ -2272,9 +2272,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/Makefile src/linux/linux/n
 +obj-$(CONFIG_BRIDGE_EBT_REDIRECT) += ebt_redirect.o
 +obj-$(CONFIG_BRIDGE_EBT_SNAT) += ebt_snat.o
 +include $(TOPDIR)/Rules.make
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_802_3.c src/linux/linux/net/bridge/netfilter/ebt_802_3.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebt_802_3.c linux/net/bridge/netfilter/ebt_802_3.c
--- src/linux/linux.stock/net/bridge/netfilter/ebt_802_3.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebt_802_3.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebt_802_3.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebt_802_3.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,74 @@
 +/*
 + * 802_3
@ -2350,9 +2350,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_802_3.c src/linux/linu
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_among.c src/linux/linux/net/bridge/netfilter/ebt_among.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebt_among.c linux/net/bridge/netfilter/ebt_among.c
--- src/linux/linux.stock/net/bridge/netfilter/ebt_among.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebt_among.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebt_among.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebt_among.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,223 @@
 +/*
 + *  ebt_among
@ -2577,9 +2577,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_among.c src/linux/linu
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_arp.c src/linux/linux/net/bridge/netfilter/ebt_arp.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebt_arp.c linux/net/bridge/netfilter/ebt_arp.c
--- src/linux/linux.stock/net/bridge/netfilter/ebt_arp.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebt_arp.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebt_arp.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebt_arp.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,149 @@
 +/*
 + *  ebt_arp
@ -2730,9 +2730,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_arp.c src/linux/linux/
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_arpreply.c src/linux/linux/net/bridge/netfilter/ebt_arpreply.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebt_arpreply.c linux/net/bridge/netfilter/ebt_arpreply.c
--- src/linux/linux.stock/net/bridge/netfilter/ebt_arpreply.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebt_arpreply.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebt_arpreply.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebt_arpreply.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,86 @@
 +/*
 + *  ebt_arpreply
@ -2820,9 +2820,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_arpreply.c src/linux/l
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_dnat.c src/linux/linux/net/bridge/netfilter/ebt_dnat.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebt_dnat.c linux/net/bridge/netfilter/ebt_dnat.c
--- src/linux/linux.stock/net/bridge/netfilter/ebt_dnat.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebt_dnat.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebt_dnat.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebt_dnat.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,65 @@
 +/*
 + *  ebt_dnat
@ -2889,9 +2889,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_dnat.c src/linux/linux
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_ip.c src/linux/linux/net/bridge/netfilter/ebt_ip.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebt_ip.c linux/net/bridge/netfilter/ebt_ip.c
--- src/linux/linux.stock/net/bridge/netfilter/ebt_ip.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebt_ip.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebt_ip.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebt_ip.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,121 @@
 +/*
 + *  ebt_ip
@ -3014,9 +3014,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_ip.c src/linux/linux/n
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_limit.c src/linux/linux/net/bridge/netfilter/ebt_limit.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebt_limit.c linux/net/bridge/netfilter/ebt_limit.c
--- src/linux/linux.stock/net/bridge/netfilter/ebt_limit.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebt_limit.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebt_limit.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebt_limit.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,101 @@
 +/*
 + *  ebt_limit
@ -3119,9 +3119,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_limit.c src/linux/linu
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_log.c src/linux/linux/net/bridge/netfilter/ebt_log.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebt_log.c linux/net/bridge/netfilter/ebt_log.c
--- src/linux/linux.stock/net/bridge/netfilter/ebt_log.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebt_log.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebt_log.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebt_log.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,152 @@
 +/*
 + *  ebt_log
@ -3275,9 +3275,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_log.c src/linux/linux/
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_mark.c src/linux/linux/net/bridge/netfilter/ebt_mark.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebt_mark.c linux/net/bridge/netfilter/ebt_mark.c
--- src/linux/linux.stock/net/bridge/netfilter/ebt_mark.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebt_mark.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebt_mark.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebt_mark.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,66 @@
 +/*
 + *  ebt_mark
@ -3345,9 +3345,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_mark.c src/linux/linux
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_mark_m.c src/linux/linux/net/bridge/netfilter/ebt_mark_m.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebt_mark_m.c linux/net/bridge/netfilter/ebt_mark_m.c
--- src/linux/linux.stock/net/bridge/netfilter/ebt_mark_m.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebt_mark_m.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebt_mark_m.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebt_mark_m.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,61 @@
 +/*
 + *  ebt_mark_m
@ -3410,9 +3410,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_mark_m.c src/linux/lin
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_pkttype.c src/linux/linux/net/bridge/netfilter/ebt_pkttype.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebt_pkttype.c linux/net/bridge/netfilter/ebt_pkttype.c
--- src/linux/linux.stock/net/bridge/netfilter/ebt_pkttype.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebt_pkttype.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebt_pkttype.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebt_pkttype.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,60 @@
 +/*
 + *  ebt_pkttype
@ -3474,9 +3474,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_pkttype.c src/linux/li
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_redirect.c src/linux/linux/net/bridge/netfilter/ebt_redirect.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebt_redirect.c linux/net/bridge/netfilter/ebt_redirect.c
--- src/linux/linux.stock/net/bridge/netfilter/ebt_redirect.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebt_redirect.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebt_redirect.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebt_redirect.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,71 @@
 +/*
 + *  ebt_redirect
@ -3549,9 +3549,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_redirect.c src/linux/l
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_snat.c src/linux/linux/net/bridge/netfilter/ebt_snat.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebt_snat.c linux/net/bridge/netfilter/ebt_snat.c
--- src/linux/linux.stock/net/bridge/netfilter/ebt_snat.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebt_snat.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebt_snat.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebt_snat.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,64 @@
 +/*
 + *  ebt_snat
@ -3617,9 +3617,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_snat.c src/linux/linux
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_stp.c src/linux/linux/net/bridge/netfilter/ebt_stp.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebt_stp.c linux/net/bridge/netfilter/ebt_stp.c
--- src/linux/linux.stock/net/bridge/netfilter/ebt_stp.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebt_stp.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebt_stp.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebt_stp.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,191 @@
 +/*
 + *  ebt_stp
@ -3812,9 +3812,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_stp.c src/linux/linux/
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_vlan.c src/linux/linux/net/bridge/netfilter/ebt_vlan.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebt_vlan.c linux/net/bridge/netfilter/ebt_vlan.c
--- src/linux/linux.stock/net/bridge/netfilter/ebt_vlan.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebt_vlan.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebt_vlan.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebt_vlan.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,259 @@
 +/*
 + * Description: EBTables 802.1Q match extension kernelspace module.
@ -4075,9 +4075,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_vlan.c src/linux/linux
 +module_exit(fini);
 +
 +EXPORT_NO_SYMBOLS;
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebtable_broute.c src/linux/linux/net/bridge/netfilter/ebtable_broute.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebtable_broute.c linux/net/bridge/netfilter/ebtable_broute.c
--- src/linux/linux.stock/net/bridge/netfilter/ebtable_broute.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebtable_broute.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebtable_broute.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebtable_broute.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,79 @@
 +/*
 + *  ebtable_broute
@ -4158,9 +4158,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebtable_broute.c src/linux
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebtable_filter.c src/linux/linux/net/bridge/netfilter/ebtable_filter.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebtable_filter.c linux/net/bridge/netfilter/ebtable_filter.c
--- src/linux/linux.stock/net/bridge/netfilter/ebtable_filter.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebtable_filter.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebtable_filter.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebtable_filter.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,90 @@
 +/*
 + *  ebtable_filter
@ -4252,9 +4252,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebtable_filter.c src/linux
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebtable_nat.c src/linux/linux/net/bridge/netfilter/ebtable_nat.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebtable_nat.c linux/net/bridge/netfilter/ebtable_nat.c
--- src/linux/linux.stock/net/bridge/netfilter/ebtable_nat.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebtable_nat.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebtable_nat.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebtable_nat.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,96 @@
 +/*
 + *  ebtable_nat
@ -4352,9 +4352,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebtable_nat.c src/linux/li
 +module_exit(fini);
 +EXPORT_NO_SYMBOLS;
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebtables.c src/linux/linux/net/bridge/netfilter/ebtables.c
+diff -Nurb linux.stock/net/bridge/netfilter/ebtables.c linux/net/bridge/netfilter/ebtables.c
--- src/linux/linux.stock/net/bridge/netfilter/ebtables.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/bridge/netfilter/ebtables.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/bridge/netfilter/ebtables.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/bridge/netfilter/ebtables.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,1490 @@
 +/*
 + *  ebtables
@ -5846,9 +5846,9 @@ diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebtables.c src/linux/linux
 +module_init(init);
 +module_exit(fini);
 +MODULE_LICENSE("GPL");
-diff -Nurb src/linux/linux.stock/net/core/dev.c src/linux/linux/net/core/dev.c
+diff -Nurb linux.stock/net/core/dev.c linux/net/core/dev.c
--- src/linux/linux.stock/net/core/dev.c	2003-10-14 04:02:55.000000000 -0400
+--- linux.stock/net/core/dev.c	2003-10-14 04:02:55.000000000 -0400
-+++ src/linux/linux/net/core/dev.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/core/dev.c	2004-07-10 23:46:39.000000000 -0400
@@ -1393,7 +1393,7 @@
@ -5880,9 +5880,9 @@ diff -Nurb src/linux/linux.stock/net/core/dev.c src/linux/linux/net/core/dev.c
 	}
 #endif
-diff -Nurb src/linux/linux.stock/net/core/netfilter.c src/linux/linux/net/core/netfilter.c
+diff -Nurb linux.stock/net/core/netfilter.c linux/net/core/netfilter.c
--- src/linux/linux.stock/net/core/netfilter.c	2004-07-10 23:29:56.000000000 -0400
+--- linux.stock/net/core/netfilter.c	2004-07-10 23:29:56.000000000 -0400
-+++ src/linux/linux/net/core/netfilter.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/core/netfilter.c	2004-07-10 23:46:39.000000000 -0400
@@ -344,10 +344,15 @@
 			       const struct net_device *indev,
 			       const struct net_device *outdev,
@ -5979,9 +5979,9 @@ diff -Nurb src/linux/linux.stock/net/core/netfilter.c src/linux/linux/net/core/n
 	}
 	switch (verdict) {
-diff -Nurb src/linux/linux.stock/net/core/skbuff.c src/linux/linux/net/core/skbuff.c
+diff -Nurb linux.stock/net/core/skbuff.c linux/net/core/skbuff.c
--- src/linux/linux.stock/net/core/skbuff.c	2003-10-14 04:09:32.000000000 -0400
+--- linux.stock/net/core/skbuff.c	2003-10-14 04:09:32.000000000 -0400
-+++ src/linux/linux/net/core/skbuff.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/core/skbuff.c	2004-07-10 23:46:39.000000000 -0400
@@ -244,6 +244,9 @@
 #ifdef CONFIG_NETFILTER_DEBUG
 	skb->nf_debug = 0;
@ -6044,9 +6044,9 @@ diff -Nurb src/linux/linux.stock/net/core/skbuff.c src/linux/linux/net/core/skbu
 		BUG();
 	copy_skb_header(n, skb);
-diff -Nurb src/linux/linux.stock/net/ipv4/ip_output.c src/linux/linux/net/ipv4/ip_output.c
+diff -Nurb linux.stock/net/ipv4/ip_output.c linux/net/ipv4/ip_output.c
--- src/linux/linux.stock/net/ipv4/ip_output.c	2003-10-14 04:09:33.000000000 -0400
+--- linux.stock/net/ipv4/ip_output.c	2003-10-14 04:09:33.000000000 -0400
-+++ src/linux/linux/net/ipv4/ip_output.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/ipv4/ip_output.c	2004-07-10 23:46:39.000000000 -0400
@@ -879,6 +879,10 @@
 		/* Connection association is same as pre-frag packet */
 		skb2->nfct = skb->nfct;
@ -6058,9 +6058,9 @@ diff -Nurb src/linux/linux.stock/net/ipv4/ip_output.c src/linux/linux/net/ipv4/i
 #ifdef CONFIG_NETFILTER_DEBUG
 		skb2->nf_debug = skb->nf_debug;
 #endif
-diff -Nurb src/linux/linux.stock/net/ipv4/netfilter/Config.in src/linux/linux/net/ipv4/netfilter/Config.in
+diff -Nurb linux.stock/net/ipv4/netfilter/Config.in linux/net/ipv4/netfilter/Config.in
--- src/linux/linux.stock/net/ipv4/netfilter/Config.in	2004-07-10 23:30:19.000000000 -0400
+--- linux.stock/net/ipv4/netfilter/Config.in	2004-07-10 23:30:19.000000000 -0400
-+++ src/linux/linux/net/ipv4/netfilter/Config.in	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/ipv4/netfilter/Config.in	2004-07-10 23:46:39.000000000 -0400
@@ -83,6 +83,9 @@
     dep_tristate '  String match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_STRING $CONFIG_IP_NF_IPTABLES
     dep_tristate '  Owner match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_OWNER $CONFIG_IP_NF_IPTABLES
@ -6071,9 +6071,9 @@ diff -Nurb src/linux/linux.stock/net/ipv4/netfilter/Config.in src/linux/linux/ne
 # The targets
   dep_tristate '  Packet filtering' CONFIG_IP_NF_FILTER $CONFIG_IP_NF_IPTABLES 
   if [ "$CONFIG_IP_NF_FILTER" != "n" ]; then
-diff -Nurb src/linux/linux.stock/net/ipv4/netfilter/Makefile src/linux/linux/net/ipv4/netfilter/Makefile
+diff -Nurb linux.stock/net/ipv4/netfilter/Makefile linux/net/ipv4/netfilter/Makefile
--- src/linux/linux.stock/net/ipv4/netfilter/Makefile	2004-07-10 23:30:19.000000000 -0400
+--- linux.stock/net/ipv4/netfilter/Makefile	2004-07-10 23:30:19.000000000 -0400
-+++ src/linux/linux/net/ipv4/netfilter/Makefile	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/ipv4/netfilter/Makefile	2004-07-10 23:46:39.000000000 -0400
@@ -149,6 +149,8 @@
 obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o
 obj-$(CONFIG_IP_NF_MATCH_REALM) += ipt_realm.o
@ -6083,9 +6083,9 @@ diff -Nurb src/linux/linux.stock/net/ipv4/netfilter/Makefile src/linux/linux/net
 # targets
 obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
 obj-$(CONFIG_IP_NF_TARGET_MIRROR) += ipt_MIRROR.o
-diff -Nurb src/linux/linux.stock/net/ipv4/netfilter/ip_tables.c src/linux/linux/net/ipv4/netfilter/ip_tables.c
+diff -Nurb linux.stock/net/ipv4/netfilter/ip_tables.c linux/net/ipv4/netfilter/ip_tables.c
--- src/linux/linux.stock/net/ipv4/netfilter/ip_tables.c	2004-07-10 23:29:53.000000000 -0400
+--- linux.stock/net/ipv4/netfilter/ip_tables.c	2004-07-10 23:29:53.000000000 -0400
-+++ src/linux/linux/net/ipv4/netfilter/ip_tables.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/ipv4/netfilter/ip_tables.c	2004-07-10 23:46:39.000000000 -0400
@@ -121,12 +121,19 @@
 static inline int
 ip_packet_match(const struct iphdr *ip,
@ -6181,9 +6181,9 @@ diff -Nurb src/linux/linux.stock/net/ipv4/netfilter/ip_tables.c src/linux/linux/
 			struct ipt_entry_target *t;
 			if (IPT_MATCH_ITERATE(e, do_match,
-diff -Nurb src/linux/linux.stock/net/ipv4/netfilter/ipt_LOG.c src/linux/linux/net/ipv4/netfilter/ipt_LOG.c
+diff -Nurb linux.stock/net/ipv4/netfilter/ipt_LOG.c linux/net/ipv4/netfilter/ipt_LOG.c
--- src/linux/linux.stock/net/ipv4/netfilter/ipt_LOG.c	2004-07-10 23:29:56.000000000 -0400
+--- linux.stock/net/ipv4/netfilter/ipt_LOG.c	2004-07-10 23:29:56.000000000 -0400
-+++ src/linux/linux/net/ipv4/netfilter/ipt_LOG.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/ipv4/netfilter/ipt_LOG.c	2004-07-10 23:46:39.000000000 -0400
@@ -319,6 +319,18 @@
 	       prefix == NULL ? loginfo->prefix : prefix,
 	       in ? in->name : "",
@ -6203,9 +6203,9 @@ diff -Nurb src/linux/linux.stock/net/ipv4/netfilter/ipt_LOG.c src/linux/linux/ne
 	if (in && !out) {
 		/* MAC logging for input chain only. */
 		printk("MAC=");
-diff -Nurb src/linux/linux.stock/net/ipv4/netfilter/ipt_physdev.c src/linux/linux/net/ipv4/netfilter/ipt_physdev.c
+diff -Nurb linux.stock/net/ipv4/netfilter/ipt_physdev.c linux/net/ipv4/netfilter/ipt_physdev.c
--- src/linux/linux.stock/net/ipv4/netfilter/ipt_physdev.c	1969-12-31 19:00:00.000000000 -0500
+--- linux.stock/net/ipv4/netfilter/ipt_physdev.c	1969-12-31 19:00:00.000000000 -0500
-+++ src/linux/linux/net/ipv4/netfilter/ipt_physdev.c	2004-07-10 23:46:39.000000000 -0400
+++ linux/net/ipv4/netfilter/ipt_physdev.c	2004-07-10 23:46:39.000000000 -0400
@@ -0,0 +1,127 @@
 +/* Kernel module to match the bridge port in and
 + * out device for IP packets coming into contact with a bridge. */
--- a/obsolete-buildroot/sources/openwrt/kernel/patches/150-mppe-mppc-0.98.patch
+++ b/obsolete-buildroot/sources/openwrt/kernel/patches/150-mppe-mppc-0.98.patch
--- a/obsolete-buildroot/sources/openwrt/kernel/patches/160-expr.patch
+++ b/obsolete-buildroot/sources/openwrt/kernel/patches/160-expr.patch
@ -0,0 +1,11 @@
 --- linux/Makefile	2004-08-16 21:31:21.850402752 -0400
 +++ linux/Makefile	2004-08-16 21:48:22.372259848 -0400
@@ -357,7 +357,7 @@
 	@rm -f .ver1
 include/linux/version.h: ./Makefile
 -	@expr length "$(KERNELRELEASE)" \<= $(uts_len) > /dev/null || \
 +	@expr "$(KERNELRELEASE)" : '.*' \<= $(uts_len) > /dev/null || \
 	  (echo KERNELRELEASE \"$(KERNELRELEASE)\" exceeds $(uts_len) characters >&2; false)
 	@echo \#define UTS_RELEASE \"$(KERNELRELEASE)\" > .ver
 	@echo \#define LINUX_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)` >> .ver
--- a/obsolete-buildroot/sources/openwrt/patches/wrt54g-router.patch
+++ b/obsolete-buildroot/sources/openwrt/patches/wrt54g-router.patch
@ -172,7 +172,7 @@ diff -bBurN WRT54G/release/src/router/shared/Makefile-openwrt WRT54G.new/release
 +clean:
 +	rm -f *.o *.so
 +
-+libshared.so: shutils.o wl.o wl_linux.o defaults.o
+libshared.so: shutils.o wl.o wl_linux.o defaults.o linux_timer.o
 +	$(LD) -shared -o $@ $^
 +
 +build_date.o: build_date.c
--- a/obsolete-buildroot/sources/openwrt/root/etc/init.d/S10boot
+++ b/obsolete-buildroot/sources/openwrt/root/etc/init.d/S10boot
@ -25,3 +25,5 @@ echo ${HOSTNAME:=OpenWrt} > /proc/sys/kernel/hostname
 echo ${DOMAINNAME:=lan}   > /proc/sys/kernel/domainname
 vconfig set_name_type VLAN_PLUS_VID_NO_PAD
 syslogd -C 16 
--- a/obsolete-buildroot/sources/openwrt/root/etc/inittab
+++ b/obsolete-buildroot/sources/openwrt/root/etc/inittab
@ -1,3 +1,3 @@
 ::sysinit:/etc/init.d/rcS
 ::shutdown:/sbin/halt
-::respawn:/bin/login
+ttyS0::respawn:/bin/login
--- a/obsolete-buildroot/sources/openwrt/root/sbin/hotplug
+++ b/obsolete-buildroot/sources/openwrt/root/sbin/hotplug
@ -1,6 +1,7 @@
 #!/bin/ash
 # $Id$
 [ "${INTERFACE%%[0-9]*}" = "wds" ] && { 
 	[ -x "/usr/sbin/nas" ] && /usr/sbin/nas lan $INTERFACE up
 	ifconfig $INTERFACE 0.0.0.0 up
 	/usr/sbin/brctl addif br0 $INTERFACE
 }
--- a/obsolete-buildroot/sources/openwrt/tools/addpattern.c
+++ b/obsolete-buildroot/sources/openwrt/tools/addpattern.c
@ -84,7 +84,7 @@ int main(int argc, char **argv)
 	time_t t;
 	struct tm *ptm;
-	fprintf(stderr, "mjn3's addpattern replacement - v0.80\n");
+	fprintf(stderr, "mjn3's addpattern replacement - v0.81\n");
 	hdr = (struct code_header *) buf;
--- a/obsolete-buildroot/sources/openwrt/tools/sstrip.c
+++ b/obsolete-buildroot/sources/openwrt/tools/sstrip.c
@ -0,0 +1,327 @@
 /* http://www.muppetlabs.com/~breadbox/software/elfkickers.html */
 /* sstrip: Copyright (C) 1999-2001 by Brian Raiter, under the GNU
 * General Public License. No warranty. See COPYING for details.
 */
 #define __MIPSEL__ 1
 #define _MIPS_SZLONG 32
 #include	<stdio.h>
 #include	<stdlib.h>
 #include	<string.h>
 #include	<errno.h>
 #include	<unistd.h>
 #include	<fcntl.h>
 #include	<elf.h>
 #include	<linux/bitops.h>
 typedef signed char s8;
 typedef unsigned char u8;
 typedef signed short s16;
 typedef unsigned short u16;
 typedef signed int s32;
 typedef unsigned int u32;
 typedef signed long long s64;
 typedef unsigned long long u64;
 #include	<asm/elf.h>
 #ifndef TRUE
 #define	TRUE		1
 #define	FALSE		0
 #endif
 #if ELF_CLASS == ELFCLASS32
 #define	Elf_Ehdr	Elf32_Ehdr
 #define	Elf_Phdr	Elf32_Phdr
 #else
 #define	Elf_Ehdr	Elf64_Ehdr
 #define	Elf_Phdr	Elf64_Phdr
 #endif
 /* The name of the program.
 */
 static char const      *progname;
 /* The name of the current file.
 */
 static char const      *filename;
 /* A simple error-handling function. FALSE is always returned for the
 * convenience of the caller.
 */
 static int err(char const *errmsg)
 {
    fprintf(stderr, "%s: %s: %s\n", progname, filename, errmsg);
    return FALSE;
 }
 /* A macro for I/O errors: The given error message is used only when
 * errno is not set.
 */
 #define	ferr(msg)	(err(errno ? strerror(errno) : (msg)))
 /* readelfheader() reads the ELF header into our global variable, and
 * checks to make sure that this is in fact a file that we should be
 * munging.
 */
 static int readelfheader(int fd, Elf_Ehdr *ehdr)
 {
    errno = 0;
    if (read(fd, ehdr, sizeof *ehdr) != sizeof *ehdr)
 	return ferr("missing or incomplete ELF header.");
    /* Check the ELF signature.
     */
    if (!(ehdr->e_ident[EI_MAG0] == ELFMAG0 &&
 	  ehdr->e_ident[EI_MAG1] == ELFMAG1 &&
 	  ehdr->e_ident[EI_MAG2] == ELFMAG2 &&
 	  ehdr->e_ident[EI_MAG3] == ELFMAG3))
 	return err("missing ELF signature.");
    /* Compare the file's class and endianness with the program's.
     */
    if (ehdr->e_ident[EI_DATA] != ELF_DATA)
 	return err("ELF file has different endianness.");
    if (ehdr->e_ident[EI_CLASS] != ELF_CLASS)
 	return err("ELF file has different word size.");
    /* Check the target architecture.
     */
    if (ehdr->e_machine != ELF_ARCH)
 	return err("ELF file created for different architecture.");
    /* Verify the sizes of the ELF header and the program segment
     * header table entries.
     */
    if (ehdr->e_ehsize != sizeof(Elf_Ehdr))
 	return err("unrecognized ELF header size.");
    if (ehdr->e_phentsize != sizeof(Elf_Phdr))
 	return err("unrecognized program segment header size.");
    /* Finally, check the file type.
     */
    if (ehdr->e_type != ET_EXEC && ehdr->e_type != ET_DYN)
 	return err("not an executable or shared-object library.");
    return TRUE;
 }
 /* readphdrtable() loads the program segment header table into memory.
 */
 static int readphdrtable(int fd, Elf_Ehdr const *ehdr, Elf_Phdr **phdrs)
 {
    size_t	size;
    if (!ehdr->e_phoff || !ehdr->e_phnum)
 	return err("ELF file has no program header table.");
    size = ehdr->e_phnum * sizeof **phdrs;
    if (!(*phdrs = malloc(size)))
 	return err("Out of memory!");
    errno = 0;
    if (read(fd, *phdrs, size) != (ssize_t)size)
 	return ferr("missing or incomplete program segment header table.");
    return TRUE;
 }
 /* getmemorysize() determines the offset of the last byte of the file
 * that is referenced by an entry in the program segment header table.
 * (Anything in the file after that point is not used when the program
 * is executing, and thus can be safely discarded.)
 */
 static int getmemorysize(Elf_Ehdr const *ehdr, Elf_Phdr const *phdrs,
 			 unsigned long *newsize)
 {
    Elf32_Phdr const   *phdr;
    unsigned long	size, n;
    int			i;
    /* Start by setting the size to include the ELF header and the
     * complete program segment header table.
     */
    size = ehdr->e_phoff + ehdr->e_phnum * sizeof *phdrs;
    if (size < sizeof *ehdr)
 	size = sizeof *ehdr;
    /* Then keep extending the size to include whatever data the
     * program segment header table references.
     */
    for (i = 0, phdr = phdrs ; i < ehdr->e_phnum ; ++i, ++phdr) {
 	if (phdr->p_type != PT_NULL) {
 	    n = phdr->p_offset + phdr->p_filesz;
 	    if (n > size)
 		size = n;
 	}
    }
    *newsize = size;
    return TRUE;
 }
 /* truncatezeros() examines the bytes at the end of the file's
 * size-to-be, and reduces the size to exclude any trailing zero
 * bytes.
 */
 static int truncatezeros(int fd, unsigned long *newsize)
 {
    unsigned char	contents[1024];
    unsigned long	size, n;
    size = *newsize;
    do {
 	n = sizeof contents;
 	if (n > size)
 	    n = size;
 	if (lseek(fd, size - n, SEEK_SET) == (off_t)-1)
 	    return ferr("cannot seek in file.");
 	if (read(fd, contents, n) != (ssize_t)n)
 	    return ferr("cannot read file contents");
 	while (n && !contents[--n])
 	    --size;
    } while (size && !n);
    /* Sanity check.
     */
    if (!size)
 	return err("ELF file is completely blank!");
    *newsize = size;
    return TRUE;
 }
 /* modifyheaders() removes references to the section header table if
 * it was stripped, and reduces program header table entries that
 * included truncated bytes at the end of the file.
 */
 static int modifyheaders(Elf_Ehdr *ehdr, Elf_Phdr *phdrs,
 			 unsigned long newsize)
 {
    Elf32_Phdr *phdr;
    int		i;
    /* If the section header table is gone, then remove all references
     * to it in the ELF header.
     */
    if (ehdr->e_shoff >= newsize) {
 	ehdr->e_shoff = 0;
 	ehdr->e_shnum = 0;
 	ehdr->e_shentsize = 0;
 	ehdr->e_shstrndx = 0;
    }
    /* The program adjusts the file size of any segment that was
     * truncated. The case of a segment being completely stripped out
     * is handled separately.
     */
    for (i = 0, phdr = phdrs ; i < ehdr->e_phnum ; ++i, ++phdr) {
 	if (phdr->p_offset >= newsize) {
 	    phdr->p_offset = newsize;
 	    phdr->p_filesz = 0;
 	} else if (phdr->p_offset + phdr->p_filesz > newsize) {
 	    phdr->p_filesz = newsize - phdr->p_offset;
 	}
    }
    return TRUE;
 }
 /* commitchanges() writes the new headers back to the original file
 * and sets the file to its new size.
 */
 static int commitchanges(int fd, Elf_Ehdr const *ehdr, Elf_Phdr *phdrs,
 			 unsigned long newsize)
 {
    size_t	n;
    /* Save the changes to the ELF header, if any.
     */
    if (lseek(fd, 0, SEEK_SET))
 	return ferr("could not rewind file");
    errno = 0;
    if (write(fd, ehdr, sizeof *ehdr) != sizeof *ehdr)
 	return err("could not modify file");
    /* Save the changes to the program segment header table, if any.
     */
    if (lseek(fd, ehdr->e_phoff, SEEK_SET) == (off_t)-1) {
 	err("could not seek in file.");
 	goto warning;
    }
    n = ehdr->e_phnum * sizeof *phdrs;
    if (write(fd, phdrs, n) != (ssize_t)n) {
 	err("could not write to file");
 	goto warning;
    }
    /* Eleventh-hour sanity check: don't truncate before the end of
     * the program segment header table.
     */
    if (newsize < ehdr->e_phoff + n)
 	newsize = ehdr->e_phoff + n;
    /* Chop off the end of the file.
     */
    if (ftruncate(fd, newsize)) {
 	err("could not resize file");
 	goto warning;
    }
    return TRUE;
  warning:
    return err("ELF file may have been corrupted!");
 }
 /* main() loops over the cmdline arguments, leaving all the real work
 * to the other functions.
 */
 int main(int argc, char *argv[])
 {
    int			fd;
    Elf_Ehdr		ehdr;
    Elf_Phdr	       *phdrs;
    unsigned long	newsize;
    char	      **arg;
    int			failures = 0;
    if (argc < 2 || argv[1][0] == '-') {
 	printf("Usage: sstrip FILE...\n"
 	       "sstrip discards all nonessential bytes from an executable.\n\n"
 	       "Version 2.0 Copyright (C) 2000,2001 Brian Raiter.\n"
 	       "This program is free software, licensed under the GNU\n"
 	       "General Public License. There is absolutely no warranty.\n");
 	return EXIT_SUCCESS;
    }
    progname = argv[0];
    for (arg = argv + 1 ; *arg != NULL ; ++arg) {
 	filename = *arg;
 	fd = open(*arg, O_RDWR);
 	if (fd < 0) {
 	    ferr("can't open");
 	    ++failures;
 	    continue;
 	}
 	if (!(readelfheader(fd, &ehdr)			&&
 	      readphdrtable(fd, &ehdr, &phdrs)		&&
 	      getmemorysize(&ehdr, phdrs, &newsize)	&&
 	      truncatezeros(fd, &newsize)		&&
 	      modifyheaders(&ehdr, phdrs, newsize)	&&
 	      commitchanges(fd, &ehdr, phdrs, newsize)))
 	    ++failures;
 	close(fd);
    }
    return failures ? EXIT_FAILURE : EXIT_SUCCESS;
 }
--- a/obsolete-buildroot/sources/openwrt/tools/trx.c
+++ b/obsolete-buildroot/sources/openwrt/tools/trx.c
@ -26,6 +26,10 @@
 * .trx file using '-m'.  It will be rounded up to be a multiple of 4K.
 * NOTE: This space will be malloc()'d.
 *
 * August 16, 2004
 *
 * Sigh... Make it endian-neutral.
 *
 * TODO: Support '-b' option to specify offsets for each file.
 */
@ -36,6 +40,16 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
 #include <endian.h>
 #include <byteswap.h>
 #if __BYTE_ORDER == __BIG_ENDIAN
 #define STORE32_LE(X)		bswap_32(X)
 #elif __BYTE_ORDER == __LITTLE_ENDIAN
 #define STORE32_LE(X)		(X)
 #else
 #error unkown endianness!
 #endif
 uint32_t crc32buf(char *buf, size_t len);
@ -74,10 +88,11 @@ int main(int argc, char **argv)
 	char *e;
 	int c, i;
 	size_t n;
 	uint32_t cur_len;
 	unsigned long maxlen = TRX_MAX_LEN;
 	struct trx_header *p;
-	fprintf(stderr, "mjn3's trx replacement - v0.80\n");
+	fprintf(stderr, "mjn3's trx replacement - v0.81\n");
 	while ((c = getopt(argc, argv, "o:m:")) != -1) {
 		switch (c) {
@ -132,21 +147,21 @@ int main(int argc, char **argv)
 	p = (struct trx_header *) buf;
-	p->magic = TRX_MAGIC;
+	p->magic = STORE32_LE(TRX_MAGIC);
-	p->len = sizeof(struct trx_header);
+	cur_len = sizeof(struct trx_header);
-	p->flag_version = (TRX_VERSION << 16);
+	p->flag_version = STORE32_LE((TRX_VERSION << 16));
 	i = 0;
 	while (optind < argc) {
-		p->offsets[i++] = p->len;
+		p->offsets[i++] = STORE32_LE(cur_len);
 		if (!(in = fopen(argv[optind], "r"))) {
 			fprintf(stderr, "can not open \"%s\" for reading\n", argv[optind]);
 			usage();
 		}
-		n = fread(buf + p->len, 1, maxlen - p->len, in);
+		n = fread(buf + cur_len, 1, maxlen - cur_len, in);
 		if (!feof(in)) {
 			fprintf(stderr, "fread failure or file \"%s\" too large\n",
 					argv[optind]);
@ -162,26 +177,29 @@ int main(int argc, char **argv)
 #undef  ROUND
 #define ROUND 4
 			if (n & (ROUND-1)) {
-				memset(buf + p->len + n, 0, ROUND - (n & (ROUND-1)));
+				memset(buf + cur_len + n, 0, ROUND - (n & (ROUND-1)));
 				n += ROUND - (n & (ROUND-1));
 			}
 		}
-		p->len += n;
+		cur_len += n;
 	}
 #undef  ROUND
 #define ROUND 0x1000
-	n = p->len & (ROUND-1);
+	n = cur_len & (ROUND-1);
 	if (n) {
-		memset(buf + p->len, 0, ROUND - n);
+		memset(buf + cur_len, 0, ROUND - n);
-		p->len += ROUND - n;
+		cur_len += ROUND - n;
 	}
 	p->crc32 = crc32buf((char *) &p->flag_version,
-						p->len - offsetof(struct trx_header, flag_version));
+						cur_len - offsetof(struct trx_header, flag_version));
 	p->crc32 = STORE32_LE(p->crc32);
-	if (!fwrite(buf, p->len, 1, out) || fflush(out)) {
+	p->len = STORE32_LE(cur_len);
 	if (!fwrite(buf, cur_len, 1, out) || fflush(out)) {
 		fprintf(stderr, "fwrite failed\n");
 		return EXIT_FAILURE;
 	}