Changeset 136


Ignore:
Timestamp:
2004-08-18T01:00:52+02:00 (13 years ago)
Author:
mbm
Message:

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

Location:
trunk/obsolete-buildroot
Files:
3 added
20 edited

Legend:

Unmodified
Added
Removed
  • trunk/obsolete-buildroot/Makefile

    r135 r136  
    4040 
    4141OPTIMIZE_FOR_CPU=$(ARCH) 
    42  
    43 # directory used by 'make publish' 
    44 PUB_DIR:=/var/www/html/testsite/ipkg 
    4542 
    4643# Command used to download source code 
     
    151148TARGET_CC=$(TARGET_CROSS)gcc 
    152149STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note 
    153  
    154150 
    155151HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \ 
     
    192188OPENWRT_IPK_DIR=$(SOURCE_DIR)/openwrt/ipkg 
    193189 
    194 $(BUILD_DIR)/Packages : $(PACKAGES_IPK) 
    195         (cd $(BUILD_DIR) ; $(IPKG_MAKE_INDEX) . > Packages) 
    196  
    197190world: $(DL_DIR) $(TARGETS_SOURCE) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS) 
    198191        @echo "ALL DONE." 
    199192 
    200 packages: ipkg-utils $(PACKAGES_IPK) $(BUILD_DIR)/Packages 
     193packages: ipkg-utils $(PACKAGES_IPK) 
     194        -@mkdir -p $(BASE_DIR)/packages 
     195        cd $(BASE_DIR)/packages 
     196        -mv $(BUILD_DIR)/*.ipk . 
     197        $(IPKG_MAKE_INDEX) . > Packages 
    201198        @echo "ALL DONE." 
    202199 
     
    241238clean: 
    242239        rm -rf $(TOOL_BUILD_DIR) $(BUILD_DIR) $(IMAGE) \ 
     240                $(BASE_DIR)/packages \ 
    243241                openwrt-linux.trx openwrt-g-code.bin openwrt-gs-code.bin \ 
    244242                openwrt-kmodules.tar.bz2 
     
    246244dirclean: $(TARGETS_DIRCLEAN) 
    247245        rm -rf $(TARGET_DIR) $(STAGING_DIR) $(IMAGE) \ 
     246                $(BASE_DIR)/packages \ 
    248247                openwrt-linux.trx openwrt-g-code.bin openwrt-gs-code.bin \ 
    249248                openwrt-kmodules.tar.bz2 
     
    253252                openwrt-linux.trx openwrt-g-code.bin openwrt-gs-code.bin \ 
    254253                openwrt-kmodules.tar.bz2 
    255  
    256 publish:         
    257         chmod 644 $(BUILD_DIR)/Packages 
    258         chmod 644 $(BUILD_DIR)/Packages.filelist 
    259         chmod 644 $(BUILD_DIR)/*.ipk 
    260         cp $(BUILD_DIR)/Packages $(PUB_DIR) 
    261         cp $(BUILD_DIR)/Packages.filelist $(PUB_DIR) 
    262         cp $(BUILD_DIR)/*.ipk $(PUB_DIR) 
    263254 
    264255sourceball:  
  • trunk/obsolete-buildroot/make/binutils-uclibc.mk

    r30 r136  
    4747 
    4848binutils-dependancies: 
    49         @if [ ! -x /usr/bin/bison ] ; then \ 
     49        @if [ -z "`which bison`" ] ; then \ 
    5050                echo -e "\n\nYou must install 'bison' on your build machine\n"; \ 
    5151                exit 1; \ 
    5252        fi; 
    53         @if [ ! -x /usr/bin/flex ] ; then \ 
     53        @if [ -z "`which flex`" ] ; then \ 
    5454                echo -e "\n\nYou must install 'flex' on your build machine\n"; \ 
    5555                exit 1; \ 
    5656        fi; 
    57         @if [ ! -x /usr/bin/msgfmt ] ; then \ 
     57        @if [ -z "`which msgfmt`" ] ; then \ 
    5858                echo -e "\n\nYou must install 'gettext' on your build machine\n"; \ 
    5959                exit 1; \ 
  • trunk/obsolete-buildroot/make/ipkg-utils.mk

    r73 r136  
    3838 
    3939IPKG_BUILDPACKAGE := PATH=$(TARGET_PATH) ipkg-buildpackage -c -o root -g root 
     40IPKG_BUILD := PATH=$(TARGET_PATH) ipkg-build -c -o root -g root 
    4041IPKG_MAKE_INDEX := PATH=$(TARGET_PATH) ipkg-make-index 
    4142 
  • trunk/obsolete-buildroot/make/openssh.mk

    r127 r136  
    109109        mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin 
    110110        cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh-keygen $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin 
    111         cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build 
     111        cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build 
    112112        rm -rf $(OPENSSH_IPK_BUILD_DIR)/build 
    113113 
     
    124124        cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin 
    125125        cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/scp $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin 
    126         cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build 
     126        cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build 
    127127        rm -rf $(OPENSSH_IPK_BUILD_DIR)/build 
    128128 
     
    133133        mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin 
    134134        cp $(OPENSSH_IPK_BUILD_DIR)/usr/sbin/sftp-server $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin 
    135         cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build 
     135        cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build 
    136136        rm -rf $(OPENSSH_IPK_BUILD_DIR)/build 
    137137 
     
    142142        mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin 
    143143        cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/sftp $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin 
    144         cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build 
     144        cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build 
    145145        rm -rf $(OPENSSH_IPK_BUILD_DIR)/build 
    146146 
     
    155155        mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin 
    156156        cp $(OPENSSH_IPK_BUILD_DIR)/usr/sbin/ssh-keysign $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin 
    157         cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build 
     157        cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build 
    158158        rm -rf $(OPENSSH_IPK_BUILD_DIR)/build 
    159159 
  • trunk/obsolete-buildroot/make/openssl.mk

    r127 r136  
    7878        -$(STRIP) --strip-unneeded $(OPENSSL_IPK_BUILD_DIR)/usr/lib/libssl.so.0.9.7 
    7979        -$(STRIP) --strip-unneeded $(OPENSSL_IPK_BUILD_DIR)/usr/lib/libcrypto.so.0.9.7 
    80         cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSL_IPK_BUILD_DIR) 
     80        cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSL_IPK_BUILD_DIR) 
    8181 
    8282openssl-ipk: $(LIBSSL_IPK) 
  • trunk/obsolete-buildroot/make/openwrt.mk

    r135 r136  
    5050 
    5151$(LINUX_DIR)/.patched: $(WRT54G_DIR)/.prepared 
    52         $(SOURCE_DIR)/patch-kernel.sh $(LINUX_DIR)/../.. $(SOURCE_DIR)/openwrt/kernel/patches 
     52        $(SOURCE_DIR)/patch-kernel.sh $(LINUX_DIR) $(SOURCE_DIR)/openwrt/kernel/patches 
    5353        # use replacement diag module code 
    5454        cp -f $(SOURCE_DIR)/openwrt/kernel/diag.c $(LINUX_DIR)/drivers/net/diag/diag_led.c 
     
    7777openwrt-kmodules.tar.bz2: $(LINUX_DIR)/$(LINUX_BINLOC) 
    7878        $(MAKE) -C $(LINUX_DIR) modules 
    79         $(MAKE) -C $(LINUX_DIR) DEPMOD=/bin/true \ 
     79        $(MAKE) -C $(LINUX_DIR) DEPMOD=true \ 
    8080                INSTALL_MOD_PATH=$(LINUX_DIR)/modules modules_install 
    8181        tar -C $(LINUX_DIR)/modules/lib -cjf openwrt-kmodules.tar.bz2 modules 
     
    203203###################################################################### 
    204204 
    205 openwrt-prune: openwrt-base 
    206         -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true; 
     205openwrt-prune: $(STAGING_DIR)/bin/sstrip openwrt-base 
     206        -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STAGING_DIR)/bin/sstrip 2>/dev/null || true; 
    207207        # remove unneeded uClibc libs 
    208208        rm -rf $(TARGET_DIR)/lib/libthread_db* 
     
    218218###################################################################### 
    219219 
     220$(STAGING_DIR)/bin/sstrip: 
     221        $(CC) -o $(STAGING_DIR)/bin/sstrip -I$(STAGING_DIR)/mipsel-linux-uclibc/include $(SOURCE_DIR)/openwrt/tools/sstrip.c 
     222 
    220223wrt-tools: 
    221224        $(CC) -o $(WRT54G_DIR)/release/tools/trx $(SOURCE_DIR)/openwrt/tools/trx.c 
  • trunk/obsolete-buildroot/make/pppoecd.mk

    r127 r136  
    4848# build the ipk package 
    4949$(PPPOECD_PACKAGE): $(PPPOECD_IPK_BIN) $(PPPOECD_IPK_BUILD_DIR)/CONTROL/control 
    50         cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(PPPOECD_IPK_BUILD_DIR) 
     50        cd $(BUILD_DIR); $(IPKG_BUILD) $(PPPOECD_IPK_BUILD_DIR) 
    5151 
    5252# main target for building the ipk version 
  • trunk/obsolete-buildroot/make/zlib.mk

    r120 r136  
    7272        -$(STRIP) --strip-unneeded $(ZLIB_IPK_DIR)/lib/libz.so* 
    7373        touch -c $(ZLIB_IPK_DIR)/lib/libz.so.1.1.4 
    74         cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(ZLIB_IPK_DIR) 
     74        cd $(ZLIB_IPK_DIR) $(IPKG_BUILDPACKAGE) 
    7575 
    7676zlib-ipk: $(ZLIB_IPK) 
  • trunk/obsolete-buildroot/sources/openwrt/kernel/linux.config

    r132 r136  
    11# 
    2 # Automatically generated make config: don't edit 
     2# Automatically generated by make menuconfig: don't edit 
    33# 
    44CONFIG_MIPS=y 
     
    153153# CONFIG_MTD_CONCAT is not set 
    154154# CONFIG_MTD_REDBOOT_PARTS is not set 
    155  
    156 # 
    157 # User Modules And Translation Layers 
    158 # 
    159155CONFIG_MTD_CHAR=y 
    160156# CONFIG_MTD_BLOCK is not set 
     
    212208# CONFIG_MTD_MTDRAM is not set 
    213209# CONFIG_MTD_BLKMTD is not set 
    214  
    215 # 
    216 # Disk-On-Chip Device Drivers 
    217 # 
    218210# CONFIG_MTD_DOC1000 is not set 
    219211# CONFIG_MTD_DOC2000 is not set 
     
    421413# CONFIG_ATM is not set 
    422414CONFIG_VLAN_8021Q=y 
    423  
    424 # 
    425  
    426 # 
    427415# CONFIG_IPX is not set 
    428416# CONFIG_ATALK is not set 
     
    586574# CONFIG_PPP_MULTILINK is not set 
    587575# CONFIG_PPP_FILTER is not set 
    588 CONFIG_PPP_ASYNC=y 
     576CONFIG_PPP_ASYNC=m 
    589577# CONFIG_PPP_SYNC_TTY is not set 
    590 CONFIG_PPP_DEFLATE=y 
    591 CONFIG_PPP_BSDCOMP=y 
     578CONFIG_PPP_DEFLATE=m 
     579CONFIG_PPP_BSDCOMP=m 
     580CONFIG_PPP_MPPE=m 
    592581CONFIG_PPPOE=m 
    593582# CONFIG_SLIP is not set 
     
    672661# 
    673662# CONFIG_INPUT_GAMEPORT is not set 
    674  
    675 # 
    676 # Input core support is needed for gameports 
    677 # 
    678  
    679 # 
    680 # Input core support is needed for joysticks 
    681 # 
    682663# CONFIG_QIC02_TAPE is not set 
    683664 
  • trunk/obsolete-buildroot/sources/openwrt/kernel/patches/100-revert_netfilter.patch

    r120 r136  
    1 diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack.h src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack.h 
    2 --- src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack.h 2003-08-12 07:43:11.000000000 -0400 
    3 +++ src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack.h   2004-05-09 04:13:03.000000000 -0400 
     1diff -Nurb linux/include/linux/netfilter_ipv4/ip_conntrack.h linux.stock/include/linux/netfilter_ipv4/ip_conntrack.h 
     2--- linux/include/linux/netfilter_ipv4/ip_conntrack.h   2003-08-12 07:43:11.000000000 -0400 
     3+++ linux.stock/include/linux/netfilter_ipv4/ip_conntrack.h     2004-05-09 04:13:03.000000000 -0400 
    44@@ -45,39 +45,27 @@ 
    55  
     
    7474 #endif /* __KERNEL__ */ 
    7575 #endif /* _IP_CONNTRACK_H */ 
    76 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 
    77 --- src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_h323.h    2003-07-04 04:12:27.000000000 -0400 
    78 +++ src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack_h323.h      1969-12-31 19:00:00.000000000 -0500 
     76diff -Nurb linux/include/linux/netfilter_ipv4/ip_conntrack_h323.h linux.stock/include/linux/netfilter_ipv4/ip_conntrack_h323.h 
     77--- linux/include/linux/netfilter_ipv4/ip_conntrack_h323.h      2003-07-04 04:12:27.000000000 -0400 
     78+++ linux.stock/include/linux/netfilter_ipv4/ip_conntrack_h323.h        1969-12-31 19:00:00.000000000 -0500 
    7979@@ -1,30 +0,0 @@ 
    8080-#ifndef _IP_CONNTRACK_H323_H 
     
    108108- 
    109109-#endif /* _IP_CONNTRACK_H323_H */ 
    110 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 
    111 --- src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_mms.h     2003-07-04 04:12:27.000000000 -0400 
    112 +++ src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack_mms.h       1969-12-31 19:00:00.000000000 -0500 
     110diff -Nurb linux/include/linux/netfilter_ipv4/ip_conntrack_mms.h linux.stock/include/linux/netfilter_ipv4/ip_conntrack_mms.h 
     111--- linux/include/linux/netfilter_ipv4/ip_conntrack_mms.h       2003-07-04 04:12:27.000000000 -0400 
     112+++ linux.stock/include/linux/netfilter_ipv4/ip_conntrack_mms.h 1969-12-31 19:00:00.000000000 -0500 
    113113@@ -1,31 +0,0 @@ 
    114114-#ifndef _IP_CONNTRACK_MMS_H 
     
    143143- 
    144144-#endif /* _IP_CONNTRACK_MMS_H */ 
    145 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 
    146 --- src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_pptp.h    2003-07-04 04:12:27.000000000 -0400 
    147 +++ src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack_pptp.h      1969-12-31 19:00:00.000000000 -0500 
     145diff -Nurb linux/include/linux/netfilter_ipv4/ip_conntrack_pptp.h linux.stock/include/linux/netfilter_ipv4/ip_conntrack_pptp.h 
     146--- linux/include/linux/netfilter_ipv4/ip_conntrack_pptp.h      2003-07-04 04:12:27.000000000 -0400 
     147+++ linux.stock/include/linux/netfilter_ipv4/ip_conntrack_pptp.h        1969-12-31 19:00:00.000000000 -0500 
    148148@@ -1,313 +0,0 @@ 
    149149-/* PPTP constants and structs */ 
     
    460460-#endif /* __KERNEL__ */ 
    461461-#endif /* _CONNTRACK_PPTP_H */ 
    462 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 
    463 --- src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h       2003-07-04 04:12:27.000000000 -0400 
    464 +++ src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h 1969-12-31 19:00:00.000000000 -0500 
     462diff -Nurb linux/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h linux.stock/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h 
     463--- linux/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h 2003-07-04 04:12:27.000000000 -0400 
     464+++ linux.stock/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h   1969-12-31 19:00:00.000000000 -0500 
    465465@@ -1,121 +0,0 @@ 
    466466-#ifndef _CONNTRACK_PROTO_GRE_H 
     
    585585- 
    586586-#endif /* _CONNTRACK_PROTO_GRE_H */ 
    587 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 
    588 --- src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_tftp.h    2003-07-04 04:12:27.000000000 -0400 
    589 +++ src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack_tftp.h      1969-12-31 19:00:00.000000000 -0500 
     587diff -Nurb linux/include/linux/netfilter_ipv4/ip_conntrack_tftp.h linux.stock/include/linux/netfilter_ipv4/ip_conntrack_tftp.h 
     588--- linux/include/linux/netfilter_ipv4/ip_conntrack_tftp.h      2003-07-04 04:12:27.000000000 -0400 
     589+++ linux.stock/include/linux/netfilter_ipv4/ip_conntrack_tftp.h        1969-12-31 19:00:00.000000000 -0500 
    590590@@ -1,13 +0,0 @@ 
    591591-#ifndef _IP_CT_TFTP 
     
    602602- 
    603603-#endif /* _IP_CT_TFTP */ 
    604 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 
    605 --- src/linux/linux/include/linux/netfilter_ipv4/ip_conntrack_tuple.h   2003-07-04 04:12:27.000000000 -0400 
    606 +++ src/linux/linux.stock/include/linux/netfilter_ipv4/ip_conntrack_tuple.h     2004-05-09 04:13:03.000000000 -0400 
     604diff -Nurb linux/include/linux/netfilter_ipv4/ip_conntrack_tuple.h linux.stock/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 
     605--- linux/include/linux/netfilter_ipv4/ip_conntrack_tuple.h     2003-07-04 04:12:27.000000000 -0400 
     606+++ linux.stock/include/linux/netfilter_ipv4/ip_conntrack_tuple.h       2004-05-09 04:13:03.000000000 -0400 
    607607@@ -14,7 +14,7 @@ 
    608608 union ip_conntrack_manip_proto 
     
    665665 #define CTINFO2DIR(ctinfo) ((ctinfo) >= IP_CT_IS_REPLY ? IP_CT_DIR_REPLY : IP_CT_DIR_ORIGINAL) 
    666666  
    667 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 
    668 --- src/linux/linux/include/linux/netfilter_ipv4/ip_nat_pptp.h  2003-07-04 04:12:27.000000000 -0400 
    669 +++ src/linux/linux.stock/include/linux/netfilter_ipv4/ip_nat_pptp.h    1969-12-31 19:00:00.000000000 -0500 
     667diff -Nurb linux/include/linux/netfilter_ipv4/ip_nat_pptp.h linux.stock/include/linux/netfilter_ipv4/ip_nat_pptp.h 
     668--- linux/include/linux/netfilter_ipv4/ip_nat_pptp.h    2003-07-04 04:12:27.000000000 -0400 
     669+++ linux.stock/include/linux/netfilter_ipv4/ip_nat_pptp.h      1969-12-31 19:00:00.000000000 -0500 
    670670@@ -1,11 +0,0 @@ 
    671671-/* PPTP constants and structs */ 
     
    680680- 
    681681-#endif /* _NAT_PPTP_H */ 
    682 diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ip_pool.h src/linux/linux.stock/include/linux/netfilter_ipv4/ip_pool.h 
    683 --- src/linux/linux/include/linux/netfilter_ipv4/ip_pool.h      2003-07-04 04:12:27.000000000 -0400 
    684 +++ src/linux/linux.stock/include/linux/netfilter_ipv4/ip_pool.h        1969-12-31 19:00:00.000000000 -0500 
     682diff -Nurb linux/include/linux/netfilter_ipv4/ip_pool.h linux.stock/include/linux/netfilter_ipv4/ip_pool.h 
     683--- linux/include/linux/netfilter_ipv4/ip_pool.h        2003-07-04 04:12:27.000000000 -0400 
     684+++ linux.stock/include/linux/netfilter_ipv4/ip_pool.h  1969-12-31 19:00:00.000000000 -0500 
    685685@@ -1,64 +0,0 @@ 
    686686-#ifndef _IP_POOL_H 
     
    748748- 
    749749-#endif /*_IP_POOL_H*/ 
    750 diff -Nurb src/linux/linux/include/linux/netfilter_ipv4/ipt_pool.h src/linux/linux.stock/include/linux/netfilter_ipv4/ipt_pool.h 
    751 --- src/linux/linux/include/linux/netfilter_ipv4/ipt_pool.h     2003-07-04 04:12:27.000000000 -0400 
    752 +++ src/linux/linux.stock/include/linux/netfilter_ipv4/ipt_pool.h       1969-12-31 19:00:00.000000000 -0500 
     750diff -Nurb linux/include/linux/netfilter_ipv4/ipt_pool.h linux.stock/include/linux/netfilter_ipv4/ipt_pool.h 
     751--- linux/include/linux/netfilter_ipv4/ipt_pool.h       2003-07-04 04:12:27.000000000 -0400 
     752+++ linux.stock/include/linux/netfilter_ipv4/ipt_pool.h 1969-12-31 19:00:00.000000000 -0500 
    753753@@ -1,25 +0,0 @@ 
    754754-#ifndef _IPT_POOL_H 
     
    777777- 
    778778-#endif /*_IPT_POOL_H*/ 
    779 diff -Nurb src/linux/linux/net/ipv4/netfilter/Config.in src/linux/linux.stock/net/ipv4/netfilter/Config.in 
    780 --- src/linux/linux/net/ipv4/netfilter/Config.in        2004-02-19 06:04:35.000000000 -0500 
    781 +++ src/linux/linux.stock/net/ipv4/netfilter/Config.in  2004-05-09 04:13:03.000000000 -0400 
     779diff -Nurb linux/net/ipv4/netfilter/Config.in linux.stock/net/ipv4/netfilter/Config.in 
     780--- linux/net/ipv4/netfilter/Config.in  2004-02-19 06:04:35.000000000 -0500 
     781+++ linux.stock/net/ipv4/netfilter/Config.in    2004-05-09 04:13:03.000000000 -0400 
    782782@@ -7,12 +7,7 @@ 
    783783 tristate 'Connection tracking (required for masq/NAT)' CONFIG_IP_NF_CONNTRACK 
     
    879879   fi 
    880880  
    881 diff -Nurb src/linux/linux/net/ipv4/netfilter/Makefile src/linux/linux.stock/net/ipv4/netfilter/Makefile 
    882 --- src/linux/linux/net/ipv4/netfilter/Makefile 2004-02-19 06:04:35.000000000 -0500 
    883 +++ src/linux/linux.stock/net/ipv4/netfilter/Makefile   2004-05-09 04:13:03.000000000 -0400 
     881diff -Nurb linux/net/ipv4/netfilter/Makefile linux.stock/net/ipv4/netfilter/Makefile 
     882--- linux/net/ipv4/netfilter/Makefile   2004-02-19 06:04:35.000000000 -0500 
     883+++ linux.stock/net/ipv4/netfilter/Makefile     2004-05-09 04:13:03.000000000 -0400 
    884884@@ -31,48 +31,20 @@ 
    885885 # connection tracking 
     
    969969 # generic ARP tables 
    970970 obj-$(CONFIG_IP_NF_ARPTABLES) += arp_tables.o 
    971 diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_core.c src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_core.c 
    972 --- src/linux/linux/net/ipv4/netfilter/ip_conntrack_core.c      2003-08-12 07:33:45.000000000 -0400 
    973 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_core.c        2004-05-09 04:13:03.000000000 -0400 
     971diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_core.c linux.stock/net/ipv4/netfilter/ip_conntrack_core.c 
     972--- linux/net/ipv4/netfilter/ip_conntrack_core.c        2003-08-12 07:33:45.000000000 -0400 
     973+++ linux.stock/net/ipv4/netfilter/ip_conntrack_core.c  2004-05-09 04:13:03.000000000 -0400 
    974974@@ -47,7 +47,11 @@ 
    975975  
     
    12261226 }; 
    12271227  
    1228 diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_ftp.c src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_ftp.c 
    1229 --- src/linux/linux/net/ipv4/netfilter/ip_conntrack_ftp.c       2003-07-04 04:12:31.000000000 -0400 
    1230 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_ftp.c 2004-05-09 04:13:03.000000000 -0400 
     1228diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_ftp.c linux.stock/net/ipv4/netfilter/ip_conntrack_ftp.c 
     1229--- linux/net/ipv4/netfilter/ip_conntrack_ftp.c 2003-07-04 04:12:31.000000000 -0400 
     1230+++ linux.stock/net/ipv4/netfilter/ip_conntrack_ftp.c   2004-05-09 04:13:03.000000000 -0400 
    12311231@@ -24,7 +24,11 @@ 
    12321232 static int loose = 0; 
     
    12741274                         csum_partial((char *)tcph, tcplen, 0))) { 
    12751275                DEBUGP("ftp_help: bad csum: %p %u %u.%u.%u.%u %u.%u.%u.%u\n", 
    1276 diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_h323.c src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_h323.c 
    1277 --- src/linux/linux/net/ipv4/netfilter/ip_conntrack_h323.c      2003-07-04 04:12:31.000000000 -0400 
    1278 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_h323.c        1969-12-31 19:00:00.000000000 -0500 
     1276diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_h323.c linux.stock/net/ipv4/netfilter/ip_conntrack_h323.c 
     1277--- linux/net/ipv4/netfilter/ip_conntrack_h323.c        2003-07-04 04:12:31.000000000 -0400 
     1278+++ linux.stock/net/ipv4/netfilter/ip_conntrack_h323.c  1969-12-31 19:00:00.000000000 -0500 
    12791279@@ -1,302 +0,0 @@ 
    12801280-/*  
     
    15801580-module_init(init); 
    15811581-module_exit(fini); 
    1582 diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_mms.c src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_mms.c 
    1583 --- src/linux/linux/net/ipv4/netfilter/ip_conntrack_mms.c       2003-07-04 04:12:31.000000000 -0400 
    1584 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_mms.c 1969-12-31 19:00:00.000000000 -0500 
     1582diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_mms.c linux.stock/net/ipv4/netfilter/ip_conntrack_mms.c 
     1583--- linux/net/ipv4/netfilter/ip_conntrack_mms.c 2003-07-04 04:12:31.000000000 -0400 
     1584+++ linux.stock/net/ipv4/netfilter/ip_conntrack_mms.c   1969-12-31 19:00:00.000000000 -0500 
    15851585@@ -1,292 +0,0 @@ 
    15861586-/* MMS extension for IP connection tracking 
     
    18761876-module_init(init); 
    18771877-module_exit(fini); 
    1878 diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_pptp.c src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_pptp.c 
    1879 --- src/linux/linux/net/ipv4/netfilter/ip_conntrack_pptp.c      2003-07-04 04:12:31.000000000 -0400 
    1880 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_pptp.c        1969-12-31 19:00:00.000000000 -0500 
     1878diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_pptp.c linux.stock/net/ipv4/netfilter/ip_conntrack_pptp.c 
     1879--- linux/net/ipv4/netfilter/ip_conntrack_pptp.c        2003-07-04 04:12:31.000000000 -0400 
     1880+++ linux.stock/net/ipv4/netfilter/ip_conntrack_pptp.c  1969-12-31 19:00:00.000000000 -0500 
    18811881@@ -1,531 +0,0 @@ 
    18821882-/* 
     
    24112411- 
    24122412-EXPORT_SYMBOL(ip_pptp_lock); 
    2413 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 
    2414 --- src/linux/linux/net/ipv4/netfilter/ip_conntrack_pptp_priv.h 2003-07-04 04:12:31.000000000 -0400 
    2415 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_pptp_priv.h   1969-12-31 19:00:00.000000000 -0500 
     2413diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_pptp_priv.h linux.stock/net/ipv4/netfilter/ip_conntrack_pptp_priv.h 
     2414--- linux/net/ipv4/netfilter/ip_conntrack_pptp_priv.h   2003-07-04 04:12:31.000000000 -0400 
     2415+++ linux.stock/net/ipv4/netfilter/ip_conntrack_pptp_priv.h     1969-12-31 19:00:00.000000000 -0500 
    24162416@@ -1,24 +0,0 @@ 
    24172417-#ifndef _IP_CT_PPTP_PRIV_H 
     
    24392439- 
    24402440-#endif 
    2441 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 
    2442 --- src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_gre.c 2003-07-04 04:12:31.000000000 -0400 
    2443 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_proto_gre.c   1969-12-31 19:00:00.000000000 -0500 
     2441diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_proto_gre.c linux.stock/net/ipv4/netfilter/ip_conntrack_proto_gre.c 
     2442--- linux/net/ipv4/netfilter/ip_conntrack_proto_gre.c   2003-07-04 04:12:31.000000000 -0400 
     2443+++ linux.stock/net/ipv4/netfilter/ip_conntrack_proto_gre.c     1969-12-31 19:00:00.000000000 -0500 
    24442444@@ -1,320 +0,0 @@ 
    24452445-/* 
     
    27632763-module_init(init); 
    27642764-module_exit(fini); 
    2765 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 
    2766 --- src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c 2003-08-12 07:33:45.000000000 -0400 
    2767 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_proto_tcp.c   2004-05-09 04:13:03.000000000 -0400 
     2765diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c linux.stock/net/ipv4/netfilter/ip_conntrack_proto_tcp.c 
     2766--- linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c   2003-08-12 07:33:45.000000000 -0400 
     2767+++ linux.stock/net/ipv4/netfilter/ip_conntrack_proto_tcp.c     2004-05-09 04:13:03.000000000 -0400 
    27682768@@ -15,11 +15,17 @@ 
    27692769 #include <linux/netfilter_ipv4/ip_conntrack_protocol.h> 
     
    28362836  
    28372837        return NF_ACCEPT; 
    2838 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 
    2839 --- src/linux/linux/net/ipv4/netfilter/ip_conntrack_proto_udp.c 2003-08-12 07:33:45.000000000 -0400 
    2840 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_proto_udp.c   2004-05-09 04:13:03.000000000 -0400 
     2838diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_proto_udp.c linux.stock/net/ipv4/netfilter/ip_conntrack_proto_udp.c 
     2839--- linux/net/ipv4/netfilter/ip_conntrack_proto_udp.c   2003-08-12 07:33:45.000000000 -0400 
     2840+++ linux.stock/net/ipv4/netfilter/ip_conntrack_proto_udp.c     2004-05-09 04:13:03.000000000 -0400 
    28412841@@ -5,7 +5,9 @@ 
    28422842 #include <linux/in.h> 
     
    28662866        return NF_ACCEPT; 
    28672867 } 
    2868 diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_standalone.c src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_standalone.c 
    2869 --- src/linux/linux/net/ipv4/netfilter/ip_conntrack_standalone.c        2003-08-12 07:33:45.000000000 -0400 
    2870 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_standalone.c  2004-05-09 04:13:03.000000000 -0400 
     2868diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_standalone.c linux.stock/net/ipv4/netfilter/ip_conntrack_standalone.c 
     2869--- linux/net/ipv4/netfilter/ip_conntrack_standalone.c  2003-08-12 07:33:45.000000000 -0400 
     2870+++ linux.stock/net/ipv4/netfilter/ip_conntrack_standalone.c    2004-05-09 04:13:03.000000000 -0400 
    28712871@@ -27,7 +27,11 @@ 
    28722872 #include <linux/netfilter_ipv4/ip_conntrack_helper.h> 
     
    29182918 EXPORT_SYMBOL(ip_conntrack_change_expect); 
    29192919 EXPORT_SYMBOL(ip_conntrack_unexpect_related); 
    2920 diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_conntrack_tftp.c src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_tftp.c 
    2921 --- src/linux/linux/net/ipv4/netfilter/ip_conntrack_tftp.c      2003-07-04 04:12:31.000000000 -0400 
    2922 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_conntrack_tftp.c        1969-12-31 19:00:00.000000000 -0500 
     2920diff -Nurb linux/net/ipv4/netfilter/ip_conntrack_tftp.c linux.stock/net/ipv4/netfilter/ip_conntrack_tftp.c 
     2921--- linux/net/ipv4/netfilter/ip_conntrack_tftp.c        2003-07-04 04:12:31.000000000 -0400 
     2922+++ linux.stock/net/ipv4/netfilter/ip_conntrack_tftp.c  1969-12-31 19:00:00.000000000 -0500 
    29232923@@ -1,126 +0,0 @@ 
    29242924-/* 
     
    30483048-module_init(init); 
    30493049-module_exit(fini); 
    3050 diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_core.c src/linux/linux.stock/net/ipv4/netfilter/ip_nat_core.c 
    3051 --- src/linux/linux/net/ipv4/netfilter/ip_nat_core.c    2003-07-04 04:12:31.000000000 -0400 
    3052 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_nat_core.c      2004-05-09 04:13:03.000000000 -0400 
     3050diff -Nurb linux/net/ipv4/netfilter/ip_nat_core.c linux.stock/net/ipv4/netfilter/ip_nat_core.c 
     3051--- linux/net/ipv4/netfilter/ip_nat_core.c      2003-07-04 04:12:31.000000000 -0400 
     3052+++ linux.stock/net/ipv4/netfilter/ip_nat_core.c        2004-05-09 04:13:03.000000000 -0400 
    30533053@@ -31,7 +31,11 @@ 
    30543054 #include <linux/netfilter_ipv4/ip_conntrack_helper.h> 
     
    31713171        ip_conntrack_destroyed = &ip_nat_cleanup_conntrack; 
    31723172  
    3173 diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_h323.c src/linux/linux.stock/net/ipv4/netfilter/ip_nat_h323.c 
    3174 --- src/linux/linux/net/ipv4/netfilter/ip_nat_h323.c    2003-07-04 04:12:31.000000000 -0400 
    3175 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_nat_h323.c      1969-12-31 19:00:00.000000000 -0500 
     3173diff -Nurb linux/net/ipv4/netfilter/ip_nat_h323.c linux.stock/net/ipv4/netfilter/ip_nat_h323.c 
     3174--- linux/net/ipv4/netfilter/ip_nat_h323.c      2003-07-04 04:12:31.000000000 -0400 
     3175+++ linux.stock/net/ipv4/netfilter/ip_nat_h323.c        1969-12-31 19:00:00.000000000 -0500 
    31763176@@ -1,403 +0,0 @@ 
    31773177-/*  
     
    35783578-module_init(init); 
    35793579-module_exit(fini); 
    3580 diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_helper.c src/linux/linux.stock/net/ipv4/netfilter/ip_nat_helper.c 
    3581 --- src/linux/linux/net/ipv4/netfilter/ip_nat_helper.c  2003-07-04 04:12:31.000000000 -0400 
    3582 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_nat_helper.c    2004-05-09 04:13:03.000000000 -0400 
     3580diff -Nurb linux/net/ipv4/netfilter/ip_nat_helper.c linux.stock/net/ipv4/netfilter/ip_nat_helper.c 
     3581--- linux/net/ipv4/netfilter/ip_nat_helper.c    2003-07-04 04:12:31.000000000 -0400 
     3582+++ linux.stock/net/ipv4/netfilter/ip_nat_helper.c      2004-05-09 04:13:03.000000000 -0400 
    35833583@@ -8,9 +8,6 @@ 
    35843584  *             - add support for SACK adjustment  
     
    37863786 static void 
    37873787 sack_adjust(struct tcphdr *tcph,  
    3788 diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_mms.c src/linux/linux.stock/net/ipv4/netfilter/ip_nat_mms.c 
    3789 --- src/linux/linux/net/ipv4/netfilter/ip_nat_mms.c     2003-07-04 04:12:31.000000000 -0400 
    3790 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_nat_mms.c       1969-12-31 19:00:00.000000000 -0500 
     3788diff -Nurb linux/net/ipv4/netfilter/ip_nat_mms.c linux.stock/net/ipv4/netfilter/ip_nat_mms.c 
     3789--- linux/net/ipv4/netfilter/ip_nat_mms.c       2003-07-04 04:12:31.000000000 -0400 
     3790+++ linux.stock/net/ipv4/netfilter/ip_nat_mms.c 1969-12-31 19:00:00.000000000 -0500 
    37913791@@ -1,330 +0,0 @@ 
    37923792-/* MMS extension for TCP NAT alteration. 
     
    41204120-module_init(init); 
    41214121-module_exit(fini); 
    4122 diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_pptp.c src/linux/linux.stock/net/ipv4/netfilter/ip_nat_pptp.c 
    4123 --- src/linux/linux/net/ipv4/netfilter/ip_nat_pptp.c    2003-07-04 04:12:31.000000000 -0400 
    4124 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_nat_pptp.c      1969-12-31 19:00:00.000000000 -0500 
     4122diff -Nurb linux/net/ipv4/netfilter/ip_nat_pptp.c linux.stock/net/ipv4/netfilter/ip_nat_pptp.c 
     4123--- linux/net/ipv4/netfilter/ip_nat_pptp.c      2003-07-04 04:12:31.000000000 -0400 
     4124+++ linux.stock/net/ipv4/netfilter/ip_nat_pptp.c        1969-12-31 19:00:00.000000000 -0500 
    41254125@@ -1,412 +0,0 @@ 
    41264126-/* 
     
    45364536-module_init(init); 
    45374537-module_exit(fini); 
    4538 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 
    4539 --- src/linux/linux/net/ipv4/netfilter/ip_nat_proto_gre.c       2003-07-04 04:12:31.000000000 -0400 
    4540 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_nat_proto_gre.c 1969-12-31 19:00:00.000000000 -0500 
     4538diff -Nurb linux/net/ipv4/netfilter/ip_nat_proto_gre.c linux.stock/net/ipv4/netfilter/ip_nat_proto_gre.c 
     4539--- linux/net/ipv4/netfilter/ip_nat_proto_gre.c 2003-07-04 04:12:31.000000000 -0400 
     4540+++ linux.stock/net/ipv4/netfilter/ip_nat_proto_gre.c   1969-12-31 19:00:00.000000000 -0500 
    45414541@@ -1,212 +0,0 @@ 
    45424542-/* 
     
    47524752-module_init(init); 
    47534753-module_exit(fini); 
    4754 diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_standalone.c src/linux/linux.stock/net/ipv4/netfilter/ip_nat_standalone.c 
    4755 --- src/linux/linux/net/ipv4/netfilter/ip_nat_standalone.c      2003-07-04 04:12:31.000000000 -0400 
    4756 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_nat_standalone.c        2004-05-09 04:13:03.000000000 -0400 
     4754diff -Nurb linux/net/ipv4/netfilter/ip_nat_standalone.c linux.stock/net/ipv4/netfilter/ip_nat_standalone.c 
     4755--- linux/net/ipv4/netfilter/ip_nat_standalone.c        2003-07-04 04:12:31.000000000 -0400 
     4756+++ linux.stock/net/ipv4/netfilter/ip_nat_standalone.c  2004-05-09 04:13:03.000000000 -0400 
    47574757@@ -37,7 +37,11 @@ 
    47584758 #include <linux/netfilter_ipv4/ip_conntrack_core.h> 
     
    47744774 EXPORT_SYMBOL(ip_nat_used_tuple); 
    47754775 MODULE_LICENSE("GPL"); 
    4776 diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_nat_tftp.c src/linux/linux.stock/net/ipv4/netfilter/ip_nat_tftp.c 
    4777 --- src/linux/linux/net/ipv4/netfilter/ip_nat_tftp.c    2003-07-04 04:12:31.000000000 -0400 
    4778 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_nat_tftp.c      1969-12-31 19:00:00.000000000 -0500 
     4776diff -Nurb linux/net/ipv4/netfilter/ip_nat_tftp.c linux.stock/net/ipv4/netfilter/ip_nat_tftp.c 
     4777--- linux/net/ipv4/netfilter/ip_nat_tftp.c      2003-07-04 04:12:31.000000000 -0400 
     4778+++ linux.stock/net/ipv4/netfilter/ip_nat_tftp.c        1969-12-31 19:00:00.000000000 -0500 
    47794779@@ -1,186 +0,0 @@ 
    47804780-/* 
     
    49644964-module_init(init); 
    49654965-module_exit(fini); 
    4966 diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_pool.c src/linux/linux.stock/net/ipv4/netfilter/ip_pool.c 
    4967 --- src/linux/linux/net/ipv4/netfilter/ip_pool.c        2003-07-04 04:12:31.000000000 -0400 
    4968 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_pool.c  1969-12-31 19:00:00.000000000 -0500 
     4966diff -Nurb linux/net/ipv4/netfilter/ip_pool.c linux.stock/net/ipv4/netfilter/ip_pool.c 
     4967--- linux/net/ipv4/netfilter/ip_pool.c  2003-07-04 04:12:31.000000000 -0400 
     4968+++ linux.stock/net/ipv4/netfilter/ip_pool.c    1969-12-31 19:00:00.000000000 -0500 
    49694969@@ -1,328 +0,0 @@ 
    49704970-/* Kernel module for IP pool management */ 
     
    52965296-module_init(init); 
    52975297-module_exit(fini); 
    5298 diff -Nurb src/linux/linux/net/ipv4/netfilter/ip_tables.c src/linux/linux.stock/net/ipv4/netfilter/ip_tables.c 
    5299 --- src/linux/linux/net/ipv4/netfilter/ip_tables.c      2003-07-04 04:12:31.000000000 -0400 
    5300 +++ src/linux/linux.stock/net/ipv4/netfilter/ip_tables.c        2004-05-09 04:13:03.000000000 -0400 
     5298diff -Nurb linux/net/ipv4/netfilter/ip_tables.c linux.stock/net/ipv4/netfilter/ip_tables.c 
     5299--- linux/net/ipv4/netfilter/ip_tables.c        2003-07-04 04:12:31.000000000 -0400 
     5300+++ linux.stock/net/ipv4/netfilter/ip_tables.c  2004-05-09 04:13:03.000000000 -0400 
    53015301@@ -62,6 +62,11 @@ 
    53025302 #include <linux/netfilter_ipv4/lockhelp.h> 
     
    54935493 } 
    54945494  
    5495 diff -Nurb src/linux/linux/net/ipv4/netfilter/ipchains_core.c src/linux/linux.stock/net/ipv4/netfilter/ipchains_core.c 
    5496 --- src/linux/linux/net/ipv4/netfilter/ipchains_core.c  2003-07-04 04:12:31.000000000 -0400 
    5497 +++ src/linux/linux.stock/net/ipv4/netfilter/ipchains_core.c    2004-05-09 04:13:03.000000000 -0400 
     5495diff -Nurb linux/net/ipv4/netfilter/ipchains_core.c linux.stock/net/ipv4/netfilter/ipchains_core.c 
     5496--- linux/net/ipv4/netfilter/ipchains_core.c    2003-07-04 04:12:31.000000000 -0400 
     5497+++ linux.stock/net/ipv4/netfilter/ipchains_core.c      2004-05-09 04:13:03.000000000 -0400 
    54985498@@ -977,10 +977,17 @@ 
    54995499                    || ftmp->ipfw.fw_dst.s_addr!=frwl->ipfw.fw_dst.s_addr 
     
    55225522 #endif 
    55235523        struct ip_chain *i; 
    5524 diff -Nurb src/linux/linux/net/ipv4/netfilter/ipfwadm_core.c src/linux/linux.stock/net/ipv4/netfilter/ipfwadm_core.c 
    5525 --- src/linux/linux/net/ipv4/netfilter/ipfwadm_core.c   2003-10-14 04:09:33.000000000 -0400 
    5526 +++ src/linux/linux.stock/net/ipv4/netfilter/ipfwadm_core.c     2004-05-09 04:13:03.000000000 -0400 
     5524diff -Nurb linux/net/ipv4/netfilter/ipfwadm_core.c linux.stock/net/ipv4/netfilter/ipfwadm_core.c 
     5525--- linux/net/ipv4/netfilter/ipfwadm_core.c     2003-10-14 04:09:33.000000000 -0400 
     5526+++ linux.stock/net/ipv4/netfilter/ipfwadm_core.c       2004-05-09 04:13:03.000000000 -0400 
    55275527@@ -20,7 +20,7 @@ 
    55285528  *     license in recognition of the original copyright. 
     
    55665566 #endif 
    55675567        return ip_chain_procinfo(IP_FW_FWD, buffer,start,offset,length, 
    5568 diff -Nurb src/linux/linux/net/ipv4/netfilter/ipt_ECN.c src/linux/linux.stock/net/ipv4/netfilter/ipt_ECN.c 
    5569 --- src/linux/linux/net/ipv4/netfilter/ipt_ECN.c        2003-10-14 04:02:57.000000000 -0400 
    5570 +++ src/linux/linux.stock/net/ipv4/netfilter/ipt_ECN.c  2004-05-09 04:13:03.000000000 -0400 
     5568diff -Nurb linux/net/ipv4/netfilter/ipt_ECN.c linux.stock/net/ipv4/netfilter/ipt_ECN.c 
     5569--- linux/net/ipv4/netfilter/ipt_ECN.c  2003-10-14 04:02:57.000000000 -0400 
     5570+++ linux.stock/net/ipv4/netfilter/ipt_ECN.c    2004-05-09 04:13:03.000000000 -0400 
    55715571@@ -87,8 +87,8 @@ 
    55725572        } 
     
    55805580                                                    sizeof(diffs), 
    55815581                                                    tcph->check^0xFFFF)); 
    5582 diff -Nurb src/linux/linux/net/ipv4/netfilter/ipt_LOG.c src/linux/linux.stock/net/ipv4/netfilter/ipt_LOG.c 
    5583 --- src/linux/linux/net/ipv4/netfilter/ipt_LOG.c        2003-07-04 04:12:31.000000000 -0400 
    5584 +++ src/linux/linux.stock/net/ipv4/netfilter/ipt_LOG.c  2004-05-09 04:13:03.000000000 -0400 
     5582diff -Nurb linux/net/ipv4/netfilter/ipt_LOG.c linux.stock/net/ipv4/netfilter/ipt_LOG.c 
     5583--- linux/net/ipv4/netfilter/ipt_LOG.c  2003-07-04 04:12:31.000000000 -0400 
     5584+++ linux.stock/net/ipv4/netfilter/ipt_LOG.c    2004-05-09 04:13:03.000000000 -0400 
    55855585@@ -14,11 +14,15 @@ 
    55865586 #include <net/route.h> 
     
    56005600 /* Use lock to serialize, so printks don't overlap */ 
    56015601 static spinlock_t log_lock = SPIN_LOCK_UNLOCKED; 
    5602 diff -Nurb src/linux/linux/net/ipv4/netfilter/ipt_REJECT.c src/linux/linux.stock/net/ipv4/netfilter/ipt_REJECT.c 
    5603 --- src/linux/linux/net/ipv4/netfilter/ipt_REJECT.c     2003-07-04 04:12:31.000000000 -0400 
    5604 +++ src/linux/linux.stock/net/ipv4/netfilter/ipt_REJECT.c       2004-05-09 04:13:03.000000000 -0400 
     5602diff -Nurb linux/net/ipv4/netfilter/ipt_REJECT.c linux.stock/net/ipv4/netfilter/ipt_REJECT.c 
     5603--- linux/net/ipv4/netfilter/ipt_REJECT.c       2003-07-04 04:12:31.000000000 -0400 
     5604+++ linux.stock/net/ipv4/netfilter/ipt_REJECT.c 2004-05-09 04:13:03.000000000 -0400 
    56055605@@ -6,8 +6,6 @@ 
    56065606 #include <linux/module.h> 
     
    56685668               length - sizeof(struct iphdr) - sizeof(struct icmphdr)); 
    56695669        icmph->checksum = ip_compute_csum((unsigned char *)icmph, 
    5670 diff -Nurb src/linux/linux/net/ipv4/netfilter/ipt_ULOG.c src/linux/linux.stock/net/ipv4/netfilter/ipt_ULOG.c 
    5671 --- src/linux/linux/net/ipv4/netfilter/ipt_ULOG.c       2003-07-04 04:12:32.000000000 -0400 
    5672 +++ src/linux/linux.stock/net/ipv4/netfilter/ipt_ULOG.c 2004-05-09 04:13:03.000000000 -0400 
     5670diff -Nurb linux/net/ipv4/netfilter/ipt_ULOG.c linux.stock/net/ipv4/netfilter/ipt_ULOG.c 
     5671--- linux/net/ipv4/netfilter/ipt_ULOG.c 2003-07-04 04:12:32.000000000 -0400 
     5672+++ linux.stock/net/ipv4/netfilter/ipt_ULOG.c   2004-05-09 04:13:03.000000000 -0400 
    56735673@@ -12,7 +12,6 @@ 
    56745674  *           module loadtime -HW 
     
    57115711        if (in) 
    57125712                strncpy(pm->indev_name, in->name, sizeof(pm->indev_name)); 
    5713 diff -Nurb src/linux/linux/net/ipv4/netfilter/ipt_multiport.c src/linux/linux.stock/net/ipv4/netfilter/ipt_multiport.c 
    5714 --- src/linux/linux/net/ipv4/netfilter/ipt_multiport.c  2003-07-04 04:12:32.000000000 -0400 
    5715 +++ src/linux/linux.stock/net/ipv4/netfilter/ipt_multiport.c    2004-05-09 04:13:03.000000000 -0400 
     5713diff -Nurb linux/net/ipv4/netfilter/ipt_multiport.c linux.stock/net/ipv4/netfilter/ipt_multiport.c 
     5714--- linux/net/ipv4/netfilter/ipt_multiport.c    2003-07-04 04:12:32.000000000 -0400 
     5715+++ linux.stock/net/ipv4/netfilter/ipt_multiport.c      2004-05-09 04:13:03.000000000 -0400 
    57165716@@ -8,7 +8,11 @@ 
    57175717 #include <linux/netfilter_ipv4/ipt_multiport.h> 
     
    57355735                && (multiinfo->flags == IPT_MULTIPORT_SOURCE 
    57365736                    || multiinfo->flags == IPT_MULTIPORT_DESTINATION 
    5737 diff -Nurb src/linux/linux/net/ipv4/netfilter/ipt_pool.c src/linux/linux.stock/net/ipv4/netfilter/ipt_pool.c 
    5738 --- src/linux/linux/net/ipv4/netfilter/ipt_pool.c       2003-07-04 04:12:32.000000000 -0400 
    5739 +++ src/linux/linux.stock/net/ipv4/netfilter/ipt_pool.c 1969-12-31 19:00:00.000000000 -0500 
     5737diff -Nurb linux/net/ipv4/netfilter/ipt_pool.c linux.stock/net/ipv4/netfilter/ipt_pool.c 
     5738--- linux/net/ipv4/netfilter/ipt_pool.c 2003-07-04 04:12:32.000000000 -0400 
     5739+++ linux.stock/net/ipv4/netfilter/ipt_pool.c   1969-12-31 19:00:00.000000000 -0500 
    57405740@@ -1,71 +0,0 @@ 
    57415741-/* Kernel module to match an IP address pool. */ 
     
    58105810-module_init(init); 
    58115811-module_exit(fini); 
    5812 diff -Nurb src/linux/linux/net/ipv6/mcast.c src/linux/linux.stock/net/ipv6/mcast.c 
    5813 --- src/linux/linux/net/ipv6/mcast.c    2003-10-14 04:09:34.000000000 -0400 
    5814 +++ src/linux/linux.stock/net/ipv6/mcast.c      2004-05-09 04:13:22.000000000 -0400 
     5812diff -Nurb linux/net/ipv6/mcast.c linux.stock/net/ipv6/mcast.c 
     5813--- linux/net/ipv6/mcast.c      2003-10-14 04:09:34.000000000 -0400 
     5814+++ linux.stock/net/ipv6/mcast.c        2004-05-09 04:13:22.000000000 -0400 
    58155815@@ -5,7 +5,7 @@ 
    58165816  *     Authors: 
     
    58225822  *     Based on linux/ipv4/igmp.c and linux/ipv4/ip_sockglue.c  
    58235823  * 
     5824--- linux/include/linux/ppp-comp.h      2004-08-16 20:58:32.089851872 -0400 
     5825+++ linux.stock/include/linux/ppp-comp.h        2004-08-16 20:59:48.217278744 -0400 
     5826@@ -24,7 +24,7 @@ 
     5827  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, 
     5828  * OR MODIFICATIONS. 
     5829  * 
     5830- * $Id: ppp-comp.h,v 1.1.1.4 2003/10/14 08:09:26 sparq Exp $ 
     5831+ * $Id: ppp-comp.h,v 1.6 1997/11/27 06:04:44 paulus Exp $ 
     5832  */ 
     5833  
     5834 /* 
  • trunk/obsolete-buildroot/sources/openwrt/kernel/patches/110-sch_htb.patch

    r120 r136  
    1 --- src/linux/linux/net/sched/sch_htb.c 2003-10-14 01:09:35.000000000 -0700 
    2 +++ src/linux/linux.2.4.26/net/sched/sch_htb.c  2004-05-10 00:05:51.000000000 -0700 
     1--- linux/net/sched/sch_htb.c   2003-10-14 01:09:35.000000000 -0700 
     2+++ linux.2.4.26/net/sched/sch_htb.c    2004-05-10 00:05:51.000000000 -0700 
    33@@ -9,6 +9,8 @@ 
    44  * Authors:    Martin Devera, <devik@cdi.cz> 
     
    554554                } 
    555555                if (hopt->quantum) 
    556 --- src/linux/linux/include/net/pkt_cls.h       2003-07-04 01:12:28.000000000 -0700 
    557 +++ src/linux/linux.2.4.26/include/net/pkt_cls.h        2004-05-10 22:21:40.000000000 -0700 
     556--- linux/include/net/pkt_cls.h 2003-07-04 01:12:28.000000000 -0700 
     557+++ linux.2.4.26/include/net/pkt_cls.h  2004-05-10 22:21:40.000000000 -0700 
    558558@@ -77,7 +77,11 @@ 
    559559        return -1; 
  • trunk/obsolete-buildroot/sources/openwrt/kernel/patches/120-openwrt.patch

    r120 r136  
    1 diff -Nurb src/linux/linux.orig/Makefile src/linux/linux/Makefile 
    2 --- src/linux/linux.orig/Makefile       2003-10-14 04:00:10.000000000 -0400 
    3 +++ src/linux/linux/Makefile    2004-05-25 21:12:24.000000000 -0400 
     1diff -Nurb linux.orig/Makefile linux/Makefile 
     2--- linux.orig/Makefile 2003-10-14 04:00:10.000000000 -0400 
     3+++ linux/Makefile      2004-05-25 21:12:24.000000000 -0400 
    44@@ -17,7 +17,7 @@ 
    55 FINDHPATH      = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu 
     
    2020  
    2121 # Turn on -pg to instrument the kernel with calls to mcount(). 
    22 diff -Nurb src/linux/linux.orig/arch/mips/brcm-boards/bcm947xx/setup.c src/linux/linux/arch/mips/brcm-boards/bcm947xx/setup.c 
    23 --- src/linux/linux.orig/arch/mips/brcm-boards/bcm947xx/setup.c 2003-11-11 09:08:46.000000000 -0500 
    24 +++ src/linux/linux/arch/mips/brcm-boards/bcm947xx/setup.c      2004-05-25 21:12:24.000000000 -0400 
     22diff -Nurb linux.orig/arch/mips/brcm-boards/bcm947xx/setup.c linux/arch/mips/brcm-boards/bcm947xx/setup.c 
     23--- linux.orig/arch/mips/brcm-boards/bcm947xx/setup.c   2003-11-11 09:08:46.000000000 -0500 
     24+++ linux/arch/mips/brcm-boards/bcm947xx/setup.c        2004-05-25 21:12:24.000000000 -0400 
    2525@@ -27,6 +27,7 @@ 
    2626 #include <linux/ext2_fs.h> 
     
    224224 } 
    225225  
    226 diff -Nurb src/linux/linux.orig/drivers/mtd/maps/bcm947xx-flash.c src/linux/linux/drivers/mtd/maps/bcm947xx-flash.c 
    227 --- src/linux/linux.orig/drivers/mtd/maps/bcm947xx-flash.c      2003-11-08 04:35:52.000000000 -0500 
    228 +++ src/linux/linux/drivers/mtd/maps/bcm947xx-flash.c   2004-05-25 21:12:24.000000000 -0400 
     226diff -Nurb linux.orig/drivers/mtd/maps/bcm947xx-flash.c linux/drivers/mtd/maps/bcm947xx-flash.c 
     227--- linux.orig/drivers/mtd/maps/bcm947xx-flash.c        2003-11-08 04:35:52.000000000 -0500 
     228+++ linux/drivers/mtd/maps/bcm947xx-flash.c     2004-05-25 21:12:24.000000000 -0400 
    229229@@ -82,7 +82,21 @@ 
    230230  
     
    249249  
    250250 void bcm947xx_map_write8(struct map_info *map, __u8 d, unsigned long adr) 
    251 diff -Nurb src/linux/linux.orig/drivers/net/Makefile src/linux/linux/drivers/net/Makefile 
    252 --- src/linux/linux.orig/drivers/net/Makefile   2004-02-12 21:35:15.000000000 -0500 
    253 +++ src/linux/linux/drivers/net/Makefile        2004-05-25 21:12:24.000000000 -0400 
     251diff -Nurb linux.orig/drivers/net/Makefile linux/drivers/net/Makefile 
     252--- linux.orig/drivers/net/Makefile     2004-02-12 21:35:15.000000000 -0500 
     253+++ linux/drivers/net/Makefile  2004-05-25 21:12:24.000000000 -0400 
    254254@@ -25,7 +25,7 @@ 
    255255 list-multi     :=      rcpci.o 
     
    261261  
    262262 ifeq ($(CONFIG_HW_QOS),y) 
    263 diff -Nurb src/linux/linux.orig/fs/Config.in src/linux/linux/fs/Config.in 
    264 --- src/linux/linux.orig/fs/Config.in   2003-07-04 04:12:05.000000000 -0400 
    265 +++ src/linux/linux/fs/Config.in        2004-05-25 21:13:03.000000000 -0400 
     263diff -Nurb linux.orig/fs/Config.in linux/fs/Config.in 
     264--- linux.orig/fs/Config.in     2003-07-04 04:12:05.000000000 -0400 
     265+++ linux/fs/Config.in  2004-05-25 21:13:03.000000000 -0400 
    266266@@ -47,6 +47,7 @@ 
    267267    int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0 
     
    272272 define_bool CONFIG_RAMFS y 
    273273  
    274 diff -Nurb src/linux/linux.orig/fs/Makefile src/linux/linux/fs/Makefile 
    275 --- src/linux/linux.orig/fs/Makefile    2003-07-04 04:12:05.000000000 -0400 
    276 +++ src/linux/linux/fs/Makefile 2004-05-25 21:13:03.000000000 -0400 
     274diff -Nurb linux.orig/fs/Makefile linux/fs/Makefile 
     275--- linux.orig/fs/Makefile      2003-07-04 04:12:05.000000000 -0400 
     276+++ linux/fs/Makefile   2004-05-25 21:13:03.000000000 -0400 
    277277@@ -68,6 +68,7 @@ 
    278278 subdir-$(CONFIG_SUN_OPENPROMFS)        += openpromfs 
     
    283283  
    284284 obj-$(CONFIG_BINFMT_AOUT)      += binfmt_aout.o 
    285 diff -Nurb src/linux/linux.orig/fs/squashfs/Makefile src/linux/linux/fs/squashfs/Makefile 
    286 --- src/linux/linux.orig/fs/squashfs/Makefile   1969-12-31 19:00:00.000000000 -0500 
    287 +++ src/linux/linux/fs/squashfs/Makefile        2004-05-25 21:13:03.000000000 -0400 
     285diff -Nurb linux.orig/fs/squashfs/Makefile linux/fs/squashfs/Makefile 
     286--- linux.orig/fs/squashfs/Makefile     1969-12-31 19:00:00.000000000 -0500 
     287+++ linux/fs/squashfs/Makefile  2004-05-25 21:13:03.000000000 -0400 
    288288@@ -0,0 +1,11 @@ 
    289289+# 
     
    298298+ 
    299299+include $(TOPDIR)/Rules.make 
    300 diff -Nurb src/linux/linux.orig/fs/squashfs/inode.c src/linux/linux/fs/squashfs/inode.c 
    301 --- src/linux/linux.orig/fs/squashfs/inode.c    1969-12-31 19:00:00.000000000 -0500 
    302 +++ src/linux/linux/fs/squashfs/inode.c 2004-05-25 21:13:03.000000000 -0400 
     300diff -Nurb linux.orig/fs/squashfs/inode.c linux/fs/squashfs/inode.c 
     301--- linux.orig/fs/squashfs/inode.c      1969-12-31 19:00:00.000000000 -0500 
     302+++ linux/fs/squashfs/inode.c   2004-05-25 21:13:03.000000000 -0400 
    303303@@ -0,0 +1,1515 @@ 
    304304+/* 
     
    18171817+MODULE_AUTHOR("Phillip Lougher <plougher@users.sourceforge.net>"); 
    18181818+MODULE_LICENSE("GPL"); 
    1819 diff -Nurb src/linux/linux.orig/include/linux/fs.h src/linux/linux/include/linux/fs.h 
    1820 --- src/linux/linux.orig/include/linux/fs.h     2003-07-04 04:12:25.000000000 -0400 
    1821 +++ src/linux/linux/include/linux/fs.h  2004-05-25 21:13:03.000000000 -0400 
     1819diff -Nurb linux.orig/include/linux/fs.h linux/include/linux/fs.h 
     1820--- linux.orig/include/linux/fs.h       2003-07-04 04:12:25.000000000 -0400 
     1821+++ linux/include/linux/fs.h    2004-05-25 21:13:03.000000000 -0400 
    18221822@@ -313,6 +313,7 @@ 
    18231823 #include <linux/usbdev_fs_i.h> 
     
    18521852        } u; 
    18531853        /* 
    1854 diff -Nurb src/linux/linux.orig/include/linux/squashfs_fs.h src/linux/linux/include/linux/squashfs_fs.h 
    1855 --- src/linux/linux.orig/include/linux/squashfs_fs.h    1969-12-31 19:00:00.000000000 -0500 
    1856 +++ src/linux/linux/include/linux/squashfs_fs.h 2004-05-25 21:13:03.000000000 -0400 
     1854diff -Nurb linux.orig/include/linux/squashfs_fs.h linux/include/linux/squashfs_fs.h 
     1855--- linux.orig/include/linux/squashfs_fs.h      1969-12-31 19:00:00.000000000 -0500 
     1856+++ linux/include/linux/squashfs_fs.h   2004-05-25 21:13:03.000000000 -0400 
    18571857@@ -0,0 +1,474 @@ 
    18581858+#ifndef SQUASHFS_FS 
     
    23302330+#endif 
    23312331+#endif 
    2332 diff -Nurb src/linux/linux.orig/include/linux/squashfs_fs_i.h src/linux/linux/include/linux/squashfs_fs_i.h 
    2333 --- src/linux/linux.orig/include/linux/squashfs_fs_i.h  1969-12-31 19:00:00.000000000 -0500 
    2334 +++ src/linux/linux/include/linux/squashfs_fs_i.h       2004-05-25 21:13:03.000000000 -0400 
     2332diff -Nurb linux.orig/include/linux/squashfs_fs_i.h linux/include/linux/squashfs_fs_i.h 
     2333--- linux.orig/include/linux/squashfs_fs_i.h    1969-12-31 19:00:00.000000000 -0500 
     2334+++ linux/include/linux/squashfs_fs_i.h 2004-05-25 21:13:03.000000000 -0400 
    23352335@@ -0,0 +1,33 @@ 
    23362336+#ifndef SQUASHFS_FS_I 
     
    23672367+       } squashfs_inode_info; 
    23682368+#endif 
    2369 diff -Nurb src/linux/linux.orig/include/linux/squashfs_fs_sb.h src/linux/linux/include/linux/squashfs_fs_sb.h 
    2370 --- src/linux/linux.orig/include/linux/squashfs_fs_sb.h 1969-12-31 19:00:00.000000000 -0500 
    2371 +++ src/linux/linux/include/linux/squashfs_fs_sb.h      2004-05-25 21:13:03.000000000 -0400 
     2369diff -Nurb linux.orig/include/linux/squashfs_fs_sb.h linux/include/linux/squashfs_fs_sb.h 
     2370--- linux.orig/include/linux/squashfs_fs_sb.h   1969-12-31 19:00:00.000000000 -0500 
     2371+++ linux/include/linux/squashfs_fs_sb.h        2004-05-25 21:13:03.000000000 -0400 
    23722372@@ -0,0 +1,65 @@ 
    23732373+#ifndef SQUASHFS_FS_SB 
     
    24362436+       } squashfs_sb_info; 
    24372437+#endif 
    2438 diff -Nurb src/linux/linux.orig/init/do_mounts.c src/linux/linux/init/do_mounts.c 
    2439 --- src/linux/linux.orig/init/do_mounts.c       2003-11-08 03:13:20.000000000 -0500 
    2440 +++ src/linux/linux/init/do_mounts.c    2004-05-25 21:13:03.000000000 -0400 
     2438diff -Nurb linux.orig/init/do_mounts.c linux/init/do_mounts.c 
     2439--- linux.orig/init/do_mounts.c 2003-11-08 03:13:20.000000000 -0500 
     2440+++ linux/init/do_mounts.c      2004-05-25 21:13:03.000000000 -0400 
    24412441@@ -16,6 +16,7 @@ 
    24422442 #include <linux/ext2_fs.h> 
     
    24872487         * Read block 1 to test for minix and ext2 superblock 
    24882488         */ 
    2489 diff -Nurb src/linux/linux.orig/kernel/ksyms.c src/linux/linux/kernel/ksyms.c 
    2490 --- src/linux/linux.orig/kernel/ksyms.c 2003-07-04 04:12:28.000000000 -0400 
    2491 +++ src/linux/linux/kernel/ksyms.c      2004-05-25 21:12:24.000000000 -0400 
     2489diff -Nurb linux.orig/kernel/ksyms.c linux/kernel/ksyms.c 
     2490--- linux.orig/kernel/ksyms.c   2003-07-04 04:12:28.000000000 -0400 
     2491+++ linux/kernel/ksyms.c        2004-05-25 21:12:24.000000000 -0400 
    24922492@@ -482,9 +482,9 @@ 
    24932493 EXPORT_SYMBOL(simple_strtoull); 
     
    25022502 EXPORT_SYMBOL(machine_halt); 
    25032503 EXPORT_SYMBOL(machine_power_off); 
    2504 diff -Nurb src/linux/linux.orig/lib/Config.in src/linux/linux/lib/Config.in 
    2505 --- src/linux/linux.orig/lib/Config.in  2003-07-04 04:12:29.000000000 -0400 
    2506 +++ src/linux/linux/lib/Config.in       2004-05-25 21:13:03.000000000 -0400 
     2504diff -Nurb linux.orig/lib/Config.in linux/lib/Config.in 
     2505--- linux.orig/lib/Config.in    2003-07-04 04:12:29.000000000 -0400 
     2506+++ linux/lib/Config.in 2004-05-25 21:13:03.000000000 -0400 
    25072507@@ -8,12 +8,14 @@ 
    25082508 # Do we need the compression support? 
  • trunk/obsolete-buildroot/sources/openwrt/kernel/patches/130-nfsswap.patch

    r120 r136  
    1 diff -Nurb src/linux/linux.orig/Documentation/netswap.txt src/linux/linux/Documentation/netswap.txt 
    2 --- src/linux/linux.orig/Documentation/netswap.txt      1969-12-31 19:00:00.000000000 -0500 
    3 +++ src/linux/linux/Documentation/netswap.txt   2004-05-31 02:18:03.000000000 -0400 
     1diff -Nurb linux.orig/Documentation/netswap.txt linux/Documentation/netswap.txt 
     2--- linux.orig/Documentation/netswap.txt        1969-12-31 19:00:00.000000000 -0500 
     3+++ linux/Documentation/netswap.txt     2004-05-31 02:18:03.000000000 -0400 
    44@@ -0,0 +1,51 @@ 
    55+                     Swapping over network 
     
    5454+Swapping over the network is insecure unless the data would be 
    5555+encrypted, which is not the case with NFS. It is also very slow. 
    56 diff -Nurb src/linux/linux.orig/Documentation/nfsswap.txt src/linux/linux/Documentation/nfsswap.txt 
    57 --- src/linux/linux.orig/Documentation/nfsswap.txt      1969-12-31 19:00:00.000000000 -0500 
    58 +++ src/linux/linux/Documentation/nfsswap.txt   2004-05-31 02:18:03.000000000 -0400 
     56diff -Nurb linux.orig/Documentation/nfsswap.txt linux/Documentation/nfsswap.txt 
     57--- linux.orig/Documentation/nfsswap.txt        1969-12-31 19:00:00.000000000 -0500 
     58+++ linux/Documentation/nfsswap.txt     2004-05-31 02:18:03.000000000 -0400 
    5959@@ -0,0 +1,41 @@ 
    6060+                   Swapping to files on NFS volumes 
     
    9999+encrypted, which is not the case with NFS. It is also very slow. 
    100100+ 
    101 diff -Nurb src/linux/linux.orig/drivers/block/blkpg.c src/linux/linux/drivers/block/blkpg.c 
    102 --- src/linux/linux.orig/drivers/block/blkpg.c  2003-07-04 04:11:31.000000000 -0400 
    103 +++ src/linux/linux/drivers/block/blkpg.c       2004-05-31 02:18:03.000000000 -0400 
     101diff -Nurb linux.orig/drivers/block/blkpg.c linux/drivers/block/blkpg.c 
     102--- linux.orig/drivers/block/blkpg.c    2003-07-04 04:11:31.000000000 -0400 
     103+++ linux/drivers/block/blkpg.c 2004-05-31 02:18:03.000000000 -0400 
    104104@@ -34,7 +34,7 @@ 
    105105 #include <linux/blk.h>                 /* for set_device_ro() */ 
     
    141141  * Delete a partition given by partition number 
    142142  * 
    143 diff -Nurb src/linux/linux.orig/fs/Config.in src/linux/linux/fs/Config.in 
    144 --- src/linux/linux.orig/fs/Config.in   2004-05-31 02:02:43.000000000 -0400 
    145 +++ src/linux/linux/fs/Config.in        2004-05-31 02:18:03.000000000 -0400 
     143diff -Nurb linux.orig/fs/Config.in linux/fs/Config.in 
     144--- linux.orig/fs/Config.in     2004-05-31 02:02:43.000000000 -0400 
     145+++ linux/fs/Config.in  2004-05-31 02:18:03.000000000 -0400 
    146146@@ -4,6 +4,12 @@ 
    147147 mainmenu_option next_comment 
     
    170170    dep_tristate 'NFS server support' CONFIG_NFSD $CONFIG_INET 
    171171    dep_mbool '  Provide NFSv3 server support' CONFIG_NFSD_V3 $CONFIG_NFSD 
    172 diff -Nurb src/linux/linux.orig/fs/Makefile src/linux/linux/fs/Makefile 
    173 --- src/linux/linux.orig/fs/Makefile    2004-05-31 02:02:42.000000000 -0400 
    174 +++ src/linux/linux/fs/Makefile 2004-05-31 02:18:03.000000000 -0400 
     172diff -Nurb linux.orig/fs/Makefile linux/fs/Makefile 
     173--- linux.orig/fs/Makefile      2004-05-31 02:02:42.000000000 -0400 
     174+++ linux/fs/Makefile   2004-05-31 02:18:03.000000000 -0400 
    175175@@ -8,7 +8,7 @@ 
    176176 O_TARGET := fs.o 
     
    190190 obj-$(CONFIG_BINFMT_AOUT)      += binfmt_aout.o 
    191191 obj-$(CONFIG_BINFMT_EM86)      += binfmt_em86.o 
    192 diff -Nurb src/linux/linux.orig/fs/blkdev_swap.c src/linux/linux/fs/blkdev_swap.c 
    193 --- src/linux/linux.orig/fs/blkdev_swap.c       1969-12-31 19:00:00.000000000 -0500 
    194 +++ src/linux/linux/fs/blkdev_swap.c    2004-05-31 02:18:03.000000000 -0400 
     192diff -Nurb linux.orig/fs/blkdev_swap.c linux/fs/blkdev_swap.c 
     193--- linux.orig/fs/blkdev_swap.c 1969-12-31 19:00:00.000000000 -0500 
     194+++ linux/fs/blkdev_swap.c      2004-05-31 02:18:03.000000000 -0400 
    195195@@ -0,0 +1,309 @@ 
    196196+/* 
     
    503503+MODULE_AUTHOR("Many. Stuffed into a module by cH (Claus-Justus Heine)"); 
    504504+MODULE_DESCRIPTION("Swapping to partitions and files on local hard-disks"); 
    505 diff -Nurb src/linux/linux.orig/fs/buffer.c src/linux/linux/fs/buffer.c 
    506 --- src/linux/linux.orig/fs/buffer.c    2003-07-04 04:12:05.000000000 -0400 
    507 +++ src/linux/linux/fs/buffer.c 2004-05-31 02:21:05.000000000 -0400 
     505diff -Nurb linux.orig/fs/buffer.c linux/fs/buffer.c 
     506--- linux.orig/fs/buffer.c      2003-07-04 04:12:05.000000000 -0400 
     507+++ linux/fs/buffer.c   2004-05-31 02:21:05.000000000 -0400 
    508508@@ -743,7 +743,7 @@ 
    509509        bh->b_private = private; 
     
    551551 { 
    552552        struct address_space *mapping = inode->i_mapping; 
    553 diff -Nurb src/linux/linux.orig/fs/nfs/Makefile src/linux/linux/fs/nfs/Makefile 
    554 --- src/linux/linux.orig/fs/nfs/Makefile        2003-07-04 04:12:07.000000000 -0400 
    555 +++ src/linux/linux/fs/nfs/Makefile     2004-05-31 02:18:03.000000000 -0400 
     553diff -Nurb linux.orig/fs/nfs/Makefile linux/fs/nfs/Makefile 
     554--- linux.orig/fs/nfs/Makefile  2003-07-04 04:12:07.000000000 -0400 
     555+++ linux/fs/nfs/Makefile       2004-05-31 02:18:03.000000000 -0400 
    556556@@ -15,6 +15,14 @@ 
    557557 obj-$(CONFIG_ROOT_NFS) += nfsroot.o mount_clnt.o       
     
    570570  
    571571 include $(TOPDIR)/Rules.make 
    572 diff -Nurb src/linux/linux.orig/fs/nfs/file.c src/linux/linux/fs/nfs/file.c 
    573 --- src/linux/linux.orig/fs/nfs/file.c  2003-07-04 04:12:07.000000000 -0400 
    574 +++ src/linux/linux/fs/nfs/file.c       2004-05-31 02:18:03.000000000 -0400 
     572diff -Nurb linux.orig/fs/nfs/file.c linux/fs/nfs/file.c 
     573--- linux.orig/fs/nfs/file.c    2003-07-04 04:12:07.000000000 -0400 
     574+++ linux/fs/nfs/file.c 2004-05-31 02:18:03.000000000 -0400 
    575575@@ -58,11 +58,6 @@ 
    576576        setattr:        nfs_notify_change, 
     
    605605  
    606606 /* 
    607 diff -Nurb src/linux/linux.orig/fs/nfs/nfs_syms.c src/linux/linux/fs/nfs/nfs_syms.c 
    608 --- src/linux/linux.orig/fs/nfs/nfs_syms.c      1969-12-31 19:00:00.000000000 -0500 
    609 +++ src/linux/linux/fs/nfs/nfs_syms.c   2004-05-31 02:18:03.000000000 -0400 
     607diff -Nurb linux.orig/fs/nfs/nfs_syms.c linux/fs/nfs/nfs_syms.c 
     608--- linux.orig/fs/nfs/nfs_syms.c        1969-12-31 19:00:00.000000000 -0500 
     609+++ linux/fs/nfs/nfs_syms.c     2004-05-31 02:18:03.000000000 -0400 
    610610@@ -0,0 +1,10 @@ 
    611611+#include <linux/config.h> 
     
    619619+EXPORT_SYMBOL(nfs_write_attributes); 
    620620+ 
    621 diff -Nurb src/linux/linux.orig/fs/nfs/nfsswap.c src/linux/linux/fs/nfs/nfsswap.c 
    622 --- src/linux/linux.orig/fs/nfs/nfsswap.c       1969-12-31 19:00:00.000000000 -0500 
    623 +++ src/linux/linux/fs/nfs/nfsswap.c    2004-05-31 02:18:03.000000000 -0400 
     621diff -Nurb linux.orig/fs/nfs/nfsswap.c linux/fs/nfs/nfsswap.c 
     622--- linux.orig/fs/nfs/nfsswap.c 1969-12-31 19:00:00.000000000 -0500 
     623+++ linux/fs/nfs/nfsswap.c      2004-05-31 02:18:03.000000000 -0400 
    624624@@ -0,0 +1,350 @@ 
    625625+/* 
     
    973973+MODULE_AUTHOR("(c) 1996-2002 cH (Claus-Justus Heine)"); 
    974974+MODULE_DESCRIPTION("Swapping to files located on volumes mounted via NFS"); 
    975 diff -Nurb src/linux/linux.orig/fs/nfs/read.c src/linux/linux/fs/nfs/read.c 
    976 --- src/linux/linux.orig/fs/nfs/read.c  2003-07-04 04:12:08.000000000 -0400 
    977 +++ src/linux/linux/fs/nfs/read.c       2004-05-31 02:18:03.000000000 -0400 
     975diff -Nurb linux.orig/fs/nfs/read.c linux/fs/nfs/read.c 
     976--- linux.orig/fs/nfs/read.c    2003-07-04 04:12:08.000000000 -0400 
     977+++ linux/fs/nfs/read.c 2004-05-31 02:18:03.000000000 -0400 
    978978@@ -50,11 +50,6 @@ 
    979979  */ 
     
    10231023        return error; 
    10241024  
    1025 diff -Nurb src/linux/linux.orig/fs/nfs/write.c src/linux/linux/fs/nfs/write.c 
    1026 --- src/linux/linux.orig/fs/nfs/write.c 2003-07-04 04:12:08.000000000 -0400 
    1027 +++ src/linux/linux/fs/nfs/write.c      2004-05-31 02:20:47.000000000 -0400 
     1025diff -Nurb linux.orig/fs/nfs/write.c linux/fs/nfs/write.c 
     1026--- linux.orig/fs/nfs/write.c   2003-07-04 04:12:08.000000000 -0400 
     1027+++ linux/fs/nfs/write.c        2004-05-31 02:20:47.000000000 -0400 
    10281028@@ -3,7 +3,6 @@ 
    10291029 #include <linux/config.h> 
     
    11231123                req = nfs_list_entry(data->pages.next); 
    11241124                nfs_list_remove_request(req); 
    1125 diff -Nurb src/linux/linux.orig/include/linux/fs.h src/linux/linux/include/linux/fs.h 
    1126 --- src/linux/linux.orig/include/linux/fs.h     2004-05-31 02:06:19.000000000 -0400 
    1127 +++ src/linux/linux/include/linux/fs.h  2004-05-31 02:18:03.000000000 -0400 
     1125diff -Nurb linux.orig/include/linux/fs.h linux/include/linux/fs.h 
     1126--- linux.orig/include/linux/fs.h       2004-05-31 02:06:19.000000000 -0400 
     1127+++ linux/include/linux/fs.h    2004-05-31 02:18:03.000000000 -0400 
    11281128@@ -1500,6 +1500,10 @@ 
    11291129 extern int inode_change_ok(struct inode *, struct iattr *); 
     
    11371137  * Common dentry functions for inclusion in the VFS 
    11381138  * or in other stackable file systems.  Some of these 
    1139 diff -Nurb src/linux/linux.orig/include/linux/nfs_fs.h src/linux/linux/include/linux/nfs_fs.h 
    1140 --- src/linux/linux.orig/include/linux/nfs_fs.h 2004-05-31 02:06:28.000000000 -0400 
    1141 +++ src/linux/linux/include/linux/nfs_fs.h      2004-05-31 02:18:03.000000000 -0400 
     1139diff -Nurb linux.orig/include/linux/nfs_fs.h linux/include/linux/nfs_fs.h 
     1140--- linux.orig/include/linux/nfs_fs.h   2004-05-31 02:06:28.000000000 -0400 
     1141+++ linux/include/linux/nfs_fs.h        2004-05-31 02:18:03.000000000 -0400 
    11421142@@ -40,8 +40,8 @@ 
    11431143  */ 
     
    11681168  
    11691169 #ifdef __KERNEL__ 
    1170 diff -Nurb src/linux/linux.orig/include/linux/slab.h src/linux/linux/include/linux/slab.h 
    1171 --- src/linux/linux.orig/include/linux/slab.h   2004-05-31 02:06:19.000000000 -0400 
    1172 +++ src/linux/linux/include/linux/slab.h        2004-05-31 02:18:03.000000000 -0400 
     1170diff -Nurb linux.orig/include/linux/slab.h linux/include/linux/slab.h 
     1171--- linux.orig/include/linux/slab.h     2004-05-31 02:06:19.000000000 -0400 
     1172+++ linux/include/linux/slab.h  2004-05-31 02:18:03.000000000 -0400 
    11731173@@ -39,6 +39,7 @@ 
    11741174 #define        SLAB_HWCACHE_ALIGN      0x00002000UL    /* align objs on a h/w cache lines */ 
     
    11791179 /* flags passed to a constructor func */ 
    11801180 #define        SLAB_CTOR_CONSTRUCTOR   0x001UL         /* if not set, then deconstructor */ 
    1181 diff -Nurb src/linux/linux.orig/include/linux/swap.h src/linux/linux/include/linux/swap.h 
    1182 --- src/linux/linux.orig/include/linux/swap.h   2004-05-31 02:06:19.000000000 -0400 
    1183 +++ src/linux/linux/include/linux/swap.h        2004-05-31 02:18:03.000000000 -0400 
     1181diff -Nurb linux.orig/include/linux/swap.h linux/include/linux/swap.h 
     1182--- linux.orig/include/linux/swap.h     2004-05-31 02:06:19.000000000 -0400 
     1183+++ linux/include/linux/swap.h  2004-05-31 02:18:03.000000000 -0400 
    11841184@@ -58,15 +58,29 @@ 
    11851185 #define SWAP_MAP_MAX   0x7fff 
     
    12341234 extern int swap_count(struct page *); 
    12351235 extern int valid_swaphandles(swp_entry_t, unsigned long *); 
    1236 diff -Nurb src/linux/linux.orig/include/net/netswapping.h src/linux/linux/include/net/netswapping.h 
    1237 --- src/linux/linux.orig/include/net/netswapping.h      1969-12-31 19:00:00.000000000 -0500 
    1238 +++ src/linux/linux/include/net/netswapping.h   2004-05-31 02:18:03.000000000 -0400 
     1236diff -Nurb linux.orig/include/net/netswapping.h linux/include/net/netswapping.h 
     1237--- linux.orig/include/net/netswapping.h        1969-12-31 19:00:00.000000000 -0500 
     1238+++ linux/include/net/netswapping.h     2004-05-31 02:18:03.000000000 -0400 
    12391239@@ -0,0 +1,47 @@ 
    12401240+#ifndef _LINUX_NETSWAPPING_H 
     
    12851285+ 
    12861286+#endif 
    1287 diff -Nurb src/linux/linux.orig/include/net/sock.h src/linux/linux/include/net/sock.h 
    1288 --- src/linux/linux.orig/include/net/sock.h     2004-05-31 02:07:17.000000000 -0400 
    1289 +++ src/linux/linux/include/net/sock.h  2004-05-31 02:18:03.000000000 -0400 
     1287diff -Nurb linux.orig/include/net/sock.h linux/include/net/sock.h 
     1288--- linux.orig/include/net/sock.h       2004-05-31 02:07:17.000000000 -0400 
     1289+++ linux/include/net/sock.h    2004-05-31 02:18:03.000000000 -0400 
    12901290@@ -103,6 +103,10 @@ 
    12911291 #include <linux/filter.h> 
     
    13241324        skb->dev = NULL; 
    13251325        skb_set_owner_r(skb, sk); 
    1326 diff -Nurb src/linux/linux.orig/kernel/ksyms.c src/linux/linux/kernel/ksyms.c 
    1327 --- src/linux/linux.orig/kernel/ksyms.c 2004-05-31 02:02:43.000000000 -0400 
    1328 +++ src/linux/linux/kernel/ksyms.c      2004-05-31 02:18:03.000000000 -0400 
     1326diff -Nurb linux.orig/kernel/ksyms.c linux/kernel/ksyms.c 
     1327--- linux.orig/kernel/ksyms.c   2004-05-31 02:02:43.000000000 -0400 
     1328+++ linux/kernel/ksyms.c        2004-05-31 02:18:03.000000000 -0400 
    13291329@@ -41,6 +41,7 @@ 
    13301330 #include <linux/mm.h> 
     
    13561356  
    13571357 #ifdef CONFIG_UID16 
    1358 diff -Nurb src/linux/linux.orig/mm/page_io.c src/linux/linux/mm/page_io.c 
    1359 --- src/linux/linux.orig/mm/page_io.c   2003-07-04 04:12:29.000000000 -0400 
    1360 +++ src/linux/linux/mm/page_io.c        2004-05-31 02:18:03.000000000 -0400 
     1358diff -Nurb linux.orig/mm/page_io.c linux/mm/page_io.c 
     1359--- linux.orig/mm/page_io.c     2003-07-04 04:12:29.000000000 -0400 
     1360+++ linux/mm/page_io.c  2004-05-31 02:18:03.000000000 -0400 
    13611361@@ -36,11 +36,8 @@ 
    13621362 static int rw_swap_page_base(int rw, swp_entry_t entry, struct page *page) 
     
    14061406 } 
    14071407  
    1408 diff -Nurb src/linux/linux.orig/mm/slab.c src/linux/linux/mm/slab.c 
    1409 --- src/linux/linux.orig/mm/slab.c      2003-07-04 04:12:29.000000000 -0400 
    1410 +++ src/linux/linux/mm/slab.c   2004-05-31 02:18:03.000000000 -0400 
     1408diff -Nurb linux.orig/mm/slab.c linux/mm/slab.c 
     1409--- linux.orig/mm/slab.c        2003-07-04 04:12:29.000000000 -0400 
     1410+++ linux/mm/slab.c     2004-05-31 02:18:03.000000000 -0400 
    14111411@@ -111,10 +111,12 @@ 
    14121412 # define CREATE_MASK   (SLAB_DEBUG_INITIAL | SLAB_RED_ZONE | \ 
     
    14631463                        /* Oops, this num of objs will cause problems. */ 
    14641464                        cachep->gfporder--; 
    1465 diff -Nurb src/linux/linux.orig/mm/swapfile.c src/linux/linux/mm/swapfile.c 
    1466 --- src/linux/linux.orig/mm/swapfile.c  2003-07-04 04:12:29.000000000 -0400 
    1467 +++ src/linux/linux/mm/swapfile.c       2004-05-31 02:18:03.000000000 -0400 
     1465diff -Nurb linux.orig/mm/swapfile.c linux/mm/swapfile.c 
     1466--- linux.orig/mm/swapfile.c    2003-07-04 04:12:29.000000000 -0400 
     1467+++ linux/mm/swapfile.c 2004-05-31 02:18:03.000000000 -0400 
    14681468@@ -11,12 +11,17 @@ 
    14691469 #include <linux/swap.h> 
     
    19541954  
    19551955 /* 
    1956 diff -Nurb src/linux/linux.orig/net/Config.in src/linux/linux/net/Config.in 
    1957 --- src/linux/linux.orig/net/Config.in  2003-07-04 04:12:29.000000000 -0400 
    1958 +++ src/linux/linux/net/Config.in       2004-05-31 02:18:03.000000000 -0400 
     1956diff -Nurb linux.orig/net/Config.in linux/net/Config.in 
     1957--- linux.orig/net/Config.in    2003-07-04 04:12:29.000000000 -0400 
     1958+++ linux/net/Config.in 2004-05-31 02:18:03.000000000 -0400 
    19591959@@ -16,6 +16,9 @@ 
    19601960 fi 
     
    19671967 if [ "$CONFIG_INET" = "y" ]; then 
    19681968    source net/ipv4/Config.in 
    1969 diff -Nurb src/linux/linux.orig/net/Makefile src/linux/linux/net/Makefile 
    1970 --- src/linux/linux.orig/net/Makefile   2003-07-04 04:12:29.000000000 -0400 
    1971 +++ src/linux/linux/net/Makefile        2004-05-31 02:18:03.000000000 -0400 
     1969diff -Nurb linux.orig/net/Makefile linux/net/Makefile 
     1970--- linux.orig/net/Makefile     2003-07-04 04:12:29.000000000 -0400 
     1971+++ linux/net/Makefile  2004-05-31 02:18:03.000000000 -0400 
    19721972@@ -51,6 +51,7 @@ 
    19731973 ifeq ($(CONFIG_NET),y) 
     
    19781978  
    19791979 include $(TOPDIR)/Rules.make 
    1980 diff -Nurb src/linux/linux.orig/net/core/sock.c src/linux/linux/net/core/sock.c 
    1981 --- src/linux/linux.orig/net/core/sock.c        2003-10-14 04:09:32.000000000 -0400 
    1982 +++ src/linux/linux/net/core/sock.c     2004-05-31 02:18:03.000000000 -0400 
     1980diff -Nurb linux.orig/net/core/sock.c linux/net/core/sock.c 
     1981--- linux.orig/net/core/sock.c  2003-10-14 04:09:32.000000000 -0400 
     1982+++ linux/net/core/sock.c       2004-05-31 02:18:03.000000000 -0400 
    19831983@@ -402,6 +402,21 @@ 
    19841984                        ret = -ENONET; 
     
    20162016                 * the UNIX standard wants it for whatever reason... -DaveM 
    20172017                 */ 
    2018 diff -Nurb src/linux/linux.orig/net/ipv4/tcp_ipv4.c src/linux/linux/net/ipv4/tcp_ipv4.c 
    2019 --- src/linux/linux.orig/net/ipv4/tcp_ipv4.c    2003-10-14 04:09:33.000000000 -0400 
    2020 +++ src/linux/linux/net/ipv4/tcp_ipv4.c 2004-05-31 02:18:03.000000000 -0400 
     2018diff -Nurb linux.orig/net/ipv4/tcp_ipv4.c linux/net/ipv4/tcp_ipv4.c 
     2019--- linux.orig/net/ipv4/tcp_ipv4.c      2003-10-14 04:09:33.000000000 -0400 
     2020+++ linux/net/ipv4/tcp_ipv4.c   2004-05-31 02:18:03.000000000 -0400 
    20212021@@ -1657,6 +1657,12 @@ 
    20222022        if (filter && sk_filter(skb, filter)) 
     
    20322032        IP_INC_STATS_BH(IpInDelivers); 
    20332033  
    2034 diff -Nurb src/linux/linux.orig/net/ipv6/tcp_ipv6.c src/linux/linux/net/ipv6/tcp_ipv6.c 
    2035 --- src/linux/linux.orig/net/ipv6/tcp_ipv6.c    2003-10-14 04:09:34.000000000 -0400 
    2036 +++ src/linux/linux/net/ipv6/tcp_ipv6.c 2004-05-31 02:18:03.000000000 -0400 
     2034diff -Nurb linux.orig/net/ipv6/tcp_ipv6.c linux/net/ipv6/tcp_ipv6.c 
     2035--- linux.orig/net/ipv6/tcp_ipv6.c      2003-10-14 04:09:34.000000000 -0400 
     2036+++ linux/net/ipv6/tcp_ipv6.c   2004-05-31 02:18:03.000000000 -0400 
    20372037@@ -1424,6 +1424,12 @@ 
    20382038        if (filter && sk_filter(skb, filter)) 
     
    20482048        /* 
    20492049         *      socket locking is here for SMP purposes as backlog rcv 
    2050 diff -Nurb src/linux/linux.orig/net/netswapping.c src/linux/linux/net/netswapping.c 
    2051 --- src/linux/linux.orig/net/netswapping.c      1969-12-31 19:00:00.000000000 -0500 
    2052 +++ src/linux/linux/net/netswapping.c   2004-05-31 02:18:03.000000000 -0400 
     2050diff -Nurb linux.orig/net/netswapping.c linux/net/netswapping.c 
     2051--- linux.orig/net/netswapping.c        1969-12-31 19:00:00.000000000 -0500 
     2052+++ linux/net/netswapping.c     2004-05-31 02:18:03.000000000 -0400 
    20532053@@ -0,0 +1,76 @@ 
    20542054+/* 
     
    21282128+module_init(netswap_init) 
    21292129+module_exit(netswap_exit) 
    2130 diff -Nurb src/linux/linux.orig/net/netsyms.c src/linux/linux/net/netsyms.c 
    2131 --- src/linux/linux.orig/net/netsyms.c  2004-05-31 02:02:49.000000000 -0400 
    2132 +++ src/linux/linux/net/netsyms.c       2004-05-31 02:18:03.000000000 -0400 
     2130diff -Nurb linux.orig/net/netsyms.c linux/net/netsyms.c 
     2131--- linux.orig/net/netsyms.c    2004-05-31 02:02:49.000000000 -0400 
     2132+++ linux/net/netsyms.c 2004-05-31 02:18:03.000000000 -0400 
    21332133@@ -601,4 +601,10 @@ 
    21342134 EXPORT_SYMBOL(wireless_send_event); 
     
    21422142+ 
    21432143 #endif  /* CONFIG_NET */ 
    2144 diff -Nurb src/linux/linux.orig/net/packet/af_packet.c src/linux/linux/net/packet/af_packet.c 
    2145 --- src/linux/linux.orig/net/packet/af_packet.c 2003-10-14 04:09:35.000000000 -0400 
    2146 +++ src/linux/linux/net/packet/af_packet.c      2004-05-31 02:18:03.000000000 -0400 
     2144diff -Nurb linux.orig/net/packet/af_packet.c linux/net/packet/af_packet.c 
     2145--- linux.orig/net/packet/af_packet.c   2003-10-14 04:09:35.000000000 -0400 
     2146+++ linux/net/packet/af_packet.c        2004-05-31 02:18:03.000000000 -0400 
    21472147@@ -449,6 +449,12 @@ 
    21482148                        snaplen = res; 
     
    21802180        if (sk->type == SOCK_DGRAM) { 
    21812181                macoff = netoff = TPACKET_ALIGN(TPACKET_HDRLEN) + 16; 
    2182 diff -Nurb src/linux/linux.orig/net/sunrpc/sched.c src/linux/linux/net/sunrpc/sched.c 
    2183 --- src/linux/linux.orig/net/sunrpc/sched.c     2003-07-04 04:12:33.000000000 -0400 
    2184 +++ src/linux/linux/net/sunrpc/sched.c  2004-05-31 02:18:03.000000000 -0400 
     2182diff -Nurb linux.orig/net/sunrpc/sched.c linux/net/sunrpc/sched.c 
     2183--- linux.orig/net/sunrpc/sched.c       2003-07-04 04:12:33.000000000 -0400 
     2184+++ linux/net/sunrpc/sched.c    2004-05-31 02:18:03.000000000 -0400 
    21852185@@ -79,10 +79,11 @@ 
    21862186  */ 
     
    23302330  
    23312331 /* 
    2332 diff -Nurb src/linux/linux.orig/net/sunrpc/xprt.c src/linux/linux/net/sunrpc/xprt.c 
    2333 --- src/linux/linux.orig/net/sunrpc/xprt.c      2003-07-04 04:12:33.000000000 -0400 
    2334 +++ src/linux/linux/net/sunrpc/xprt.c   2004-05-31 02:18:03.000000000 -0400 
     2332diff -Nurb linux.orig/net/sunrpc/xprt.c linux/net/sunrpc/xprt.c 
     2333--- linux.orig/net/sunrpc/xprt.c        2003-07-04 04:12:33.000000000 -0400 
     2334+++ linux/net/sunrpc/xprt.c     2004-05-31 02:18:03.000000000 -0400 
    23352335@@ -139,7 +139,7 @@ 
    23362336 __xprt_lock_write(struct rpc_xprt *xprt, struct rpc_task *task) 
  • trunk/obsolete-buildroot/sources/openwrt/kernel/patches/140-ebtables-brnf-5.patch

    r120 r136  
    1 diff -Nurb src/linux/linux.stock/include/linux/if_bridge.h src/linux/linux/include/linux/if_bridge.h 
    2 --- src/linux/linux.stock/include/linux/if_bridge.h     2003-10-14 04:09:25.000000000 -0400 
    3 +++ src/linux/linux/include/linux/if_bridge.h   2004-07-10 23:46:39.000000000 -0400 
     1diff -Nurb linux.stock/include/linux/if_bridge.h linux/include/linux/if_bridge.h 
     2--- linux.stock/include/linux/if_bridge.h       2003-10-14 04:09:25.000000000 -0400 
     3+++ linux/include/linux/if_bridge.h     2004-07-10 23:46:39.000000000 -0400 
    44@@ -102,7 +102,8 @@ 
    55 struct net_bridge_port; 
     
    1212 #endif 
    1313  
    14 diff -Nurb src/linux/linux.stock/include/linux/netfilter.h src/linux/linux/include/linux/netfilter.h 
    15 --- src/linux/linux.stock/include/linux/netfilter.h     2004-07-10 23:30:09.000000000 -0400 
    16 +++ src/linux/linux/include/linux/netfilter.h   2004-07-10 23:46:39.000000000 -0400 
     14diff -Nurb linux.stock/include/linux/netfilter.h linux/include/linux/netfilter.h 
     15--- linux.stock/include/linux/netfilter.h       2004-07-10 23:30:09.000000000 -0400 
     16+++ linux/include/linux/netfilter.h     2004-07-10 23:46:39.000000000 -0400 
    1717@@ -119,17 +119,23 @@ 
    1818 /* This is gross, but inline doesn't cut it for avoiding the function 
     
    4242 /* Call setsockopt() */ 
    4343 int nf_setsockopt(struct sock *sk, int pf, int optval, char *opt,  
    44 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 
    45 --- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_802_3.h    1969-12-31 19:00:00.000000000 -0500 
    46 +++ src/linux/linux/include/linux/netfilter_bridge/ebt_802_3.h  2004-07-10 23:46:39.000000000 -0400 
     44diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_802_3.h linux/include/linux/netfilter_bridge/ebt_802_3.h 
     45--- linux.stock/include/linux/netfilter_bridge/ebt_802_3.h      1969-12-31 19:00:00.000000000 -0500 
     46+++ linux/include/linux/netfilter_bridge/ebt_802_3.h    2004-07-10 23:46:39.000000000 -0400 
    4747@@ -0,0 +1,60 @@ 
    4848+#ifndef __LINUX_BRIDGE_EBT_802_3_H 
     
    106106+ 
    107107+#endif 
    108 diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_among.h src/linux/linux/include/linux/netfilter_bridge/ebt_among.h 
    109 --- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_among.h    1969-12-31 19:00:00.000000000 -0500 
    110 +++ src/linux/linux/include/linux/netfilter_bridge/ebt_among.h  2004-07-10 23:46:39.000000000 -0400 
     108diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_among.h linux/include/linux/netfilter_bridge/ebt_among.h 
     109--- linux.stock/include/linux/netfilter_bridge/ebt_among.h      1969-12-31 19:00:00.000000000 -0500 
     110+++ linux/include/linux/netfilter_bridge/ebt_among.h    2004-07-10 23:46:39.000000000 -0400 
    111111@@ -0,0 +1,65 @@ 
    112112+#ifndef __LINUX_BRIDGE_EBT_AMONG_H 
     
    175175+ 
    176176+#endif 
    177 diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_arp.h src/linux/linux/include/linux/netfilter_bridge/ebt_arp.h 
    178 --- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_arp.h      1969-12-31 19:00:00.000000000 -0500 
    179 +++ src/linux/linux/include/linux/netfilter_bridge/ebt_arp.h    2004-07-10 23:46:39.000000000 -0400 
     177diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_arp.h linux/include/linux/netfilter_bridge/ebt_arp.h 
     178--- linux.stock/include/linux/netfilter_bridge/ebt_arp.h        1969-12-31 19:00:00.000000000 -0500 
     179+++ linux/include/linux/netfilter_bridge/ebt_arp.h      2004-07-10 23:46:39.000000000 -0400 
    180180@@ -0,0 +1,32 @@ 
    181181+#ifndef __LINUX_BRIDGE_EBT_ARP_H 
     
    211211+ 
    212212+#endif 
    213 diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_arpreply.h src/linux/linux/include/linux/netfilter_bridge/ebt_arpreply.h 
    214 --- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_arpreply.h 1969-12-31 19:00:00.000000000 -0500 
    215 +++ src/linux/linux/include/linux/netfilter_bridge/ebt_arpreply.h       2004-07-10 23:46:39.000000000 -0400 
     213diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_arpreply.h linux/include/linux/netfilter_bridge/ebt_arpreply.h 
     214--- linux.stock/include/linux/netfilter_bridge/ebt_arpreply.h   1969-12-31 19:00:00.000000000 -0500 
     215+++ linux/include/linux/netfilter_bridge/ebt_arpreply.h 2004-07-10 23:46:39.000000000 -0400 
    216216@@ -0,0 +1,11 @@ 
    217217+#ifndef __LINUX_BRIDGE_EBT_ARPREPLY_H 
     
    226226+ 
    227227+#endif 
    228 diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_ip.h src/linux/linux/include/linux/netfilter_bridge/ebt_ip.h 
    229 --- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_ip.h       1969-12-31 19:00:00.000000000 -0500 
    230 +++ src/linux/linux/include/linux/netfilter_bridge/ebt_ip.h     2004-07-10 23:46:39.000000000 -0400 
     228diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_ip.h linux/include/linux/netfilter_bridge/ebt_ip.h 
     229--- linux.stock/include/linux/netfilter_bridge/ebt_ip.h 1969-12-31 19:00:00.000000000 -0500 
     230+++ linux/include/linux/netfilter_bridge/ebt_ip.h       2004-07-10 23:46:39.000000000 -0400 
    231231@@ -0,0 +1,43 @@ 
    232232+/* 
     
    273273+ 
    274274+#endif 
    275 diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_limit.h src/linux/linux/include/linux/netfilter_bridge/ebt_limit.h 
    276 --- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_limit.h    1969-12-31 19:00:00.000000000 -0500 
    277 +++ src/linux/linux/include/linux/netfilter_bridge/ebt_limit.h  2004-07-10 23:46:39.000000000 -0400 
     275diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_limit.h linux/include/linux/netfilter_bridge/ebt_limit.h 
     276--- linux.stock/include/linux/netfilter_bridge/ebt_limit.h      1969-12-31 19:00:00.000000000 -0500 
     277+++ linux/include/linux/netfilter_bridge/ebt_limit.h    2004-07-10 23:46:39.000000000 -0400 
    278278@@ -0,0 +1,23 @@ 
    279279+#ifndef __LINUX_BRIDGE_EBT_LIMIT_H 
     
    300300+ 
    301301+#endif 
    302 diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_log.h src/linux/linux/include/linux/netfilter_bridge/ebt_log.h 
    303 --- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_log.h      1969-12-31 19:00:00.000000000 -0500 
    304 +++ src/linux/linux/include/linux/netfilter_bridge/ebt_log.h    2004-07-10 23:46:39.000000000 -0400 
     302diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_log.h linux/include/linux/netfilter_bridge/ebt_log.h 
     303--- linux.stock/include/linux/netfilter_bridge/ebt_log.h        1969-12-31 19:00:00.000000000 -0500 
     304+++ linux/include/linux/netfilter_bridge/ebt_log.h      2004-07-10 23:46:39.000000000 -0400 
    305305@@ -0,0 +1,17 @@ 
    306306+#ifndef __LINUX_BRIDGE_EBT_LOG_H 
     
    321321+ 
    322322+#endif 
    323 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 
    324 --- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_mark_m.h   1969-12-31 19:00:00.000000000 -0500 
    325 +++ src/linux/linux/include/linux/netfilter_bridge/ebt_mark_m.h 2004-07-10 23:46:39.000000000 -0400 
     323diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_mark_m.h linux/include/linux/netfilter_bridge/ebt_mark_m.h 
     324--- linux.stock/include/linux/netfilter_bridge/ebt_mark_m.h     1969-12-31 19:00:00.000000000 -0500 
     325+++ linux/include/linux/netfilter_bridge/ebt_mark_m.h   2004-07-10 23:46:39.000000000 -0400 
    326326@@ -0,0 +1,15 @@ 
    327327+#ifndef __LINUX_BRIDGE_EBT_MARK_M_H 
     
    340340+ 
    341341+#endif 
    342 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 
    343 --- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_mark_t.h   1969-12-31 19:00:00.000000000 -0500 
    344 +++ src/linux/linux/include/linux/netfilter_bridge/ebt_mark_t.h 2004-07-10 23:46:39.000000000 -0400 
     342diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_mark_t.h linux/include/linux/netfilter_bridge/ebt_mark_t.h 
     343--- linux.stock/include/linux/netfilter_bridge/ebt_mark_t.h     1969-12-31 19:00:00.000000000 -0500 
     344+++ linux/include/linux/netfilter_bridge/ebt_mark_t.h   2004-07-10 23:46:39.000000000 -0400 
    345345@@ -0,0 +1,12 @@ 
    346346+#ifndef __LINUX_BRIDGE_EBT_MARK_T_H 
     
    356356+ 
    357357+#endif 
    358 diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_nat.h src/linux/linux/include/linux/netfilter_bridge/ebt_nat.h 
    359 --- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_nat.h      1969-12-31 19:00:00.000000000 -0500 
    360 +++ src/linux/linux/include/linux/netfilter_bridge/ebt_nat.h    2004-07-10 23:46:39.000000000 -0400 
     358diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_nat.h linux/include/linux/netfilter_bridge/ebt_nat.h 
     359--- linux.stock/include/linux/netfilter_bridge/ebt_nat.h        1969-12-31 19:00:00.000000000 -0500 
     360+++ linux/include/linux/netfilter_bridge/ebt_nat.h      2004-07-10 23:46:39.000000000 -0400 
    361361@@ -0,0 +1,13 @@ 
    362362+#ifndef __LINUX_BRIDGE_EBT_NAT_H 
     
    373373+ 
    374374+#endif 
    375 diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_pkttype.h src/linux/linux/include/linux/netfilter_bridge/ebt_pkttype.h 
    376 --- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_pkttype.h  1969-12-31 19:00:00.000000000 -0500 
    377 +++ src/linux/linux/include/linux/netfilter_bridge/ebt_pkttype.h        2004-07-10 23:46:39.000000000 -0400 
     375diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_pkttype.h linux/include/linux/netfilter_bridge/ebt_pkttype.h 
     376--- linux.stock/include/linux/netfilter_bridge/ebt_pkttype.h    1969-12-31 19:00:00.000000000 -0500 
     377+++ linux/include/linux/netfilter_bridge/ebt_pkttype.h  2004-07-10 23:46:39.000000000 -0400 
    378378@@ -0,0 +1,11 @@ 
    379379+#ifndef __LINUX_BRIDGE_EBT_PKTTYPE_H 
     
    388388+ 
    389389+#endif 
    390 diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_redirect.h src/linux/linux/include/linux/netfilter_bridge/ebt_redirect.h 
    391 --- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_redirect.h 1969-12-31 19:00:00.000000000 -0500 
    392 +++ src/linux/linux/include/linux/netfilter_bridge/ebt_redirect.h       2004-07-10 23:46:39.000000000 -0400 
     390diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_redirect.h linux/include/linux/netfilter_bridge/ebt_redirect.h 
     391--- linux.stock/include/linux/netfilter_bridge/ebt_redirect.h   1969-12-31 19:00:00.000000000 -0500 
     392+++ linux/include/linux/netfilter_bridge/ebt_redirect.h 2004-07-10 23:46:39.000000000 -0400 
    393393@@ -0,0 +1,11 @@ 
    394394+#ifndef __LINUX_BRIDGE_EBT_REDIRECT_H 
     
    403403+ 
    404404+#endif 
    405 diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_stp.h src/linux/linux/include/linux/netfilter_bridge/ebt_stp.h 
    406 --- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_stp.h      1969-12-31 19:00:00.000000000 -0500 
    407 +++ src/linux/linux/include/linux/netfilter_bridge/ebt_stp.h    2004-07-10 23:46:39.000000000 -0400 
     405diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_stp.h linux/include/linux/netfilter_bridge/ebt_stp.h 
     406--- linux.stock/include/linux/netfilter_bridge/ebt_stp.h        1969-12-31 19:00:00.000000000 -0500 
     407+++ linux/include/linux/netfilter_bridge/ebt_stp.h      2004-07-10 23:46:39.000000000 -0400 
    408408@@ -0,0 +1,46 @@ 
    409409+#ifndef __LINUX_BRIDGE_EBT_STP_H 
     
    453453+ 
    454454+#endif 
    455 diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebt_vlan.h src/linux/linux/include/linux/netfilter_bridge/ebt_vlan.h 
    456 --- src/linux/linux.stock/include/linux/netfilter_bridge/ebt_vlan.h     1969-12-31 19:00:00.000000000 -0500 
    457 +++ src/linux/linux/include/linux/netfilter_bridge/ebt_vlan.h   2004-07-10 23:46:39.000000000 -0400 
     455diff -Nurb linux.stock/include/linux/netfilter_bridge/ebt_vlan.h linux/include/linux/netfilter_bridge/ebt_vlan.h 
     456--- linux.stock/include/linux/netfilter_bridge/ebt_vlan.h       1969-12-31 19:00:00.000000000 -0500 
     457+++ linux/include/linux/netfilter_bridge/ebt_vlan.h     2004-07-10 23:46:39.000000000 -0400 
    458458@@ -0,0 +1,20 @@ 
    459459+#ifndef __LINUX_BRIDGE_EBT_VLAN_H 
     
    477477+ 
    478478+#endif 
    479 diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge/ebtables.h src/linux/linux/include/linux/netfilter_bridge/ebtables.h 
    480 --- src/linux/linux.stock/include/linux/netfilter_bridge/ebtables.h     1969-12-31 19:00:00.000000000 -0500 
    481 +++ src/linux/linux/include/linux/netfilter_bridge/ebtables.h   2004-07-10 23:46:39.000000000 -0400 
     479diff -Nurb linux.stock/include/linux/netfilter_bridge/ebtables.h linux/include/linux/netfilter_bridge/ebtables.h 
     480--- linux.stock/include/linux/netfilter_bridge/ebtables.h       1969-12-31 19:00:00.000000000 -0500 
     481+++ linux/include/linux/netfilter_bridge/ebtables.h     2004-07-10 23:46:39.000000000 -0400 
    482482@@ -0,0 +1,361 @@ 
    483483+/* 
     
    842842+ 
    843843+#endif 
    844 diff -Nurb src/linux/linux.stock/include/linux/netfilter_bridge.h src/linux/linux/include/linux/netfilter_bridge.h 
    845 --- src/linux/linux.stock/include/linux/netfilter_bridge.h      2003-07-04 04:12:26.000000000 -0400 
    846 +++ src/linux/linux/include/linux/netfilter_bridge.h    2004-07-10 23:46:39.000000000 -0400 
     844diff -Nurb linux.stock/include/linux/netfilter_bridge.h linux/include/linux/netfilter_bridge.h 
     845--- linux.stock/include/linux/netfilter_bridge.h        2003-07-04 04:12:26.000000000 -0400 
     846+++ linux/include/linux/netfilter_bridge.h      2004-07-10 23:46:39.000000000 -0400 
    847847@@ -6,6 +6,10 @@ 
    848848  
     
    934934+#endif /* __KERNEL__ */ 
    935935 #endif 
    936 diff -Nurb src/linux/linux.stock/include/linux/netfilter_ipv4/ipt_physdev.h src/linux/linux/include/linux/netfilter_ipv4/ipt_physdev.h 
    937 --- src/linux/linux.stock/include/linux/netfilter_ipv4/ipt_physdev.h    1969-12-31 19:00:00.000000000 -0500 
    938 +++ src/linux/linux/include/linux/netfilter_ipv4/ipt_physdev.h  2004-07-10 23:46:39.000000000 -0400 
     936diff -Nurb linux.stock/include/linux/netfilter_ipv4/ipt_physdev.h linux/include/linux/netfilter_ipv4/ipt_physdev.h 
     937--- linux.stock/include/linux/netfilter_ipv4/ipt_physdev.h      1969-12-31 19:00:00.000000000 -0500 
     938+++ linux/include/linux/netfilter_ipv4/ipt_physdev.h    2004-07-10 23:46:39.000000000 -0400 
    939939@@ -0,0 +1,24 @@ 
    940940+#ifndef _IPT_PHYSDEV_H 
     
    962962+ 
    963963+#endif /*_IPT_PHYSDEV_H*/ 
    964 diff -Nurb src/linux/linux.stock/include/linux/netfilter_ipv4.h src/linux/linux/include/linux/netfilter_ipv4.h 
    965 --- src/linux/linux.stock/include/linux/netfilter_ipv4.h        2004-07-10 23:30:09.000000000 -0400 
    966 +++ src/linux/linux/include/linux/netfilter_ipv4.h      2004-07-10 23:46:39.000000000 -0400 
     964diff -Nurb linux.stock/include/linux/netfilter_ipv4.h linux/include/linux/netfilter_ipv4.h 
     965--- linux.stock/include/linux/netfilter_ipv4.h  2004-07-10 23:30:09.000000000 -0400 
     966+++ linux/include/linux/netfilter_ipv4.h        2004-07-10 23:46:39.000000000 -0400 
    967967@@ -54,8 +54,10 @@ 
    968968        NF_IP_PRI_CONNTRACK_DEFRAG = -400, 
     
    976976        NF_IP_PRI_NAT_SRC = 100, 
    977977        NF_IP_PRI_LAST = INT_MAX, 
    978 diff -Nurb src/linux/linux.stock/include/linux/skbuff.h src/linux/linux/include/linux/skbuff.h 
    979 --- src/linux/linux.stock/include/linux/skbuff.h        2003-07-04 04:12:26.000000000 -0400 
    980 +++ src/linux/linux/include/linux/skbuff.h      2004-07-10 23:46:39.000000000 -0400 
     978diff -Nurb linux.stock/include/linux/skbuff.h linux/include/linux/skbuff.h 
     979--- linux.stock/include/linux/skbuff.h  2003-07-04 04:12:26.000000000 -0400 
     980+++ linux/include/linux/skbuff.h        2004-07-10 23:46:39.000000000 -0400 
    981981@@ -92,6 +92,20 @@ 
    982982 struct nf_ct_info { 
     
    10311031  
    10321032 #endif /* __KERNEL__ */ 
    1033 diff -Nurb src/linux/linux.stock/include/linux/sysctl.h src/linux/linux/include/linux/sysctl.h 
    1034 --- src/linux/linux.stock/include/linux/sysctl.h        2004-07-10 23:29:55.000000000 -0400 
    1035 +++ src/linux/linux/include/linux/sysctl.h      2004-07-10 23:46:39.000000000 -0400 
     1033diff -Nurb linux.stock/include/linux/sysctl.h linux/include/linux/sysctl.h 
     1034--- linux.stock/include/linux/sysctl.h  2004-07-10 23:29:55.000000000 -0400 
     1035+++ linux/include/linux/sysctl.h        2004-07-10 23:46:39.000000000 -0400 
    10361036@@ -547,6 +547,15 @@ 
    10371037        NET_DECNET_CONF_DEV_STATE = 7 
     
    10501050  
    10511051 /* CTL_FS names: */ 
    1052 diff -Nurb src/linux/linux.stock/net/8021q/vlan_dev.c src/linux/linux/net/8021q/vlan_dev.c 
    1053 --- src/linux/linux.stock/net/8021q/vlan_dev.c  2003-07-04 04:12:29.000000000 -0400 
    1054 +++ src/linux/linux/net/8021q/vlan_dev.c        2004-07-10 23:46:39.000000000 -0400 
     1052diff -Nurb linux.stock/net/8021q/vlan_dev.c linux/net/8021q/vlan_dev.c 
     1053--- linux.stock/net/8021q/vlan_dev.c    2003-07-04 04:12:29.000000000 -0400 
     1054+++ linux/net/8021q/vlan_dev.c  2004-07-10 23:46:39.000000000 -0400 
    10551055@@ -503,6 +503,10 @@ 
    10561056        stats->tx_packets++; /* for statics only */ 
     
    10641064  
    10651065        return 0; 
    1066 diff -Nurb src/linux/linux.stock/net/Config.in src/linux/linux/net/Config.in 
    1067 --- src/linux/linux.stock/net/Config.in 2004-07-10 23:29:49.000000000 -0400 
    1068 +++ src/linux/linux/net/Config.in       2004-07-10 23:46:39.000000000 -0400 
     1066diff -Nurb linux.stock/net/Config.in linux/net/Config.in 
     1067--- linux.stock/net/Config.in   2004-07-10 23:29:49.000000000 -0400 
     1068+++ linux/net/Config.in 2004-07-10 23:46:39.000000000 -0400 
    10691069@@ -68,6 +68,9 @@ 
    10701070    source net/decnet/Config.in 
     
    10771077    tristate 'CCITT X.25 Packet Layer (EXPERIMENTAL)' CONFIG_X25 
    10781078    tristate 'LAPB Data Link Driver (EXPERIMENTAL)' CONFIG_LAPB 
    1079 diff -Nurb src/linux/linux.stock/net/Makefile src/linux/linux/net/Makefile 
    1080 --- src/linux/linux.stock/net/Makefile  2004-07-10 23:29:49.000000000 -0400 
    1081 +++ src/linux/linux/net/Makefile        2004-07-10 23:49:10.000000000 -0400 
     1079diff -Nurb linux.stock/net/Makefile linux/net/Makefile 
     1080--- linux.stock/net/Makefile    2004-07-10 23:29:49.000000000 -0400 
     1081+++ linux/net/Makefile  2004-07-10 23:49:10.000000000 -0400 
    10821082@@ -26,6 +26,12 @@ 
    10831083 endif 
     
    10931093 subdir-$(CONFIG_PACKET)                += packet 
    10941094 subdir-$(CONFIG_NET_SCHED)     += sched 
    1095 diff -Nurb src/linux/linux.stock/net/bridge/Makefile src/linux/linux/net/bridge/Makefile 
    1096 --- src/linux/linux.stock/net/bridge/Makefile   2003-07-04 04:12:30.000000000 -0400 
    1097 +++ src/linux/linux/net/bridge/Makefile 2004-07-10 23:46:39.000000000 -0400 
     1095diff -Nurb linux.stock/net/bridge/Makefile linux/net/bridge/Makefile 
     1096--- linux.stock/net/bridge/Makefile     2003-07-04 04:12:30.000000000 -0400 
     1097+++ linux/net/bridge/Makefile   2004-07-10 23:46:39.000000000 -0400 
    10981098@@ -7,10 +7,17 @@ 
    10991099 # 
     
    11141114  
    11151115 include $(TOPDIR)/Rules.make 
    1116 diff -Nurb src/linux/linux.stock/net/bridge/br.c src/linux/linux/net/bridge/br.c 
    1117 --- src/linux/linux.stock/net/bridge/br.c       2003-10-14 04:09:32.000000000 -0400 
    1118 +++ src/linux/linux/net/bridge/br.c     2004-07-10 23:46:39.000000000 -0400 
     1116diff -Nurb linux.stock/net/bridge/br.c linux/net/bridge/br.c 
     1117--- linux.stock/net/bridge/br.c 2003-10-14 04:09:32.000000000 -0400 
     1118+++ linux/net/bridge/br.c       2004-07-10 23:46:39.000000000 -0400 
    11191119@@ -29,6 +29,8 @@ 
    11201120 #include "../atm/lec.h" 
     
    11561156 module_init(br_init) 
    11571157 module_exit(br_deinit) 
    1158 diff -Nurb src/linux/linux.stock/net/bridge/br_forward.c src/linux/linux/net/bridge/br_forward.c 
    1159 --- src/linux/linux.stock/net/bridge/br_forward.c       2003-10-14 04:09:32.000000000 -0400 
    1160 +++ src/linux/linux/net/bridge/br_forward.c     2004-07-10 23:46:39.000000000 -0400 
     1158diff -Nurb linux.stock/net/bridge/br_forward.c linux/net/bridge/br_forward.c 
     1159--- linux.stock/net/bridge/br_forward.c 2003-10-14 04:09:32.000000000 -0400 
     1160+++ linux/net/bridge/br_forward.c       2004-07-10 23:46:39.000000000 -0400 
    11611161@@ -30,18 +30,21 @@ 
    11621162        return 1; 
     
    12061206  
    12071207 /* called under bridge lock */ 
    1208 diff -Nurb src/linux/linux.stock/net/bridge/br_input.c src/linux/linux/net/bridge/br_input.c 
    1209 --- src/linux/linux.stock/net/bridge/br_input.c 2003-10-14 04:09:32.000000000 -0400 
    1210 +++ src/linux/linux/net/bridge/br_input.c       2004-07-10 23:48:36.000000000 -0400 
     1208diff -Nurb linux.stock/net/bridge/br_input.c linux/net/bridge/br_input.c 
     1209--- linux.stock/net/bridge/br_input.c   2003-10-14 04:09:32.000000000 -0400 
     1210+++ linux/net/bridge/br_input.c 2004-07-10 23:48:36.000000000 -0400 
    12111211@@ -24,6 +24,9 @@ 
    12121212  
     
    12751275+       return 0; 
    12761276 } 
    1277 diff -Nurb src/linux/linux.stock/net/bridge/br_netfilter.c src/linux/linux/net/bridge/br_netfilter.c 
    1278 --- src/linux/linux.stock/net/bridge/br_netfilter.c     1969-12-31 19:00:00.000000000 -0500 
    1279 +++ src/linux/linux/net/bridge/br_netfilter.c   2004-07-10 23:46:39.000000000 -0400 
     1277diff -Nurb linux.stock/net/bridge/br_netfilter.c linux/net/bridge/br_netfilter.c 
     1278--- linux.stock/net/bridge/br_netfilter.c       1969-12-31 19:00:00.000000000 -0500 
     1279+++ linux/net/bridge/br_netfilter.c     2004-07-10 23:46:39.000000000 -0400 
    12801280@@ -0,0 +1,896 @@ 
    12811281+/* 
     
    21752175+ 
    21762176+} 
    2177 diff -Nurb src/linux/linux.stock/net/bridge/br_private.h src/linux/linux/net/bridge/br_private.h 
    2178 --- src/linux/linux.stock/net/bridge/br_private.h       2003-10-14 04:09:32.000000000 -0400 
    2179 +++ src/linux/linux/net/bridge/br_private.h     2004-07-10 23:46:39.000000000 -0400 
     2177diff -Nurb linux.stock/net/bridge/br_private.h linux/net/bridge/br_private.h 
     2178--- linux.stock/net/bridge/br_private.h 2003-10-14 04:09:32.000000000 -0400 
     2179+++ linux/net/bridge/br_private.h       2004-07-10 23:46:39.000000000 -0400 
    21802180@@ -145,8 +145,10 @@ 
    21812181 /* br_forward.c */ 
     
    22102210 extern int br_is_root_bridge(struct net_bridge *br); 
    22112211 extern struct net_bridge_port *br_get_port(struct net_bridge *br, 
    2212 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/Config.in src/linux/linux/net/bridge/netfilter/Config.in 
    2213 --- src/linux/linux.stock/net/bridge/netfilter/Config.in        1969-12-31 19:00:00.000000000 -0500 
    2214 +++ src/linux/linux/net/bridge/netfilter/Config.in      2004-07-10 23:46:39.000000000 -0400 
     2212diff -Nurb linux.stock/net/bridge/netfilter/Config.in linux/net/bridge/netfilter/Config.in 
     2213--- linux.stock/net/bridge/netfilter/Config.in  1969-12-31 19:00:00.000000000 -0500 
     2214+++ linux/net/bridge/netfilter/Config.in        2004-07-10 23:46:39.000000000 -0400 
    22152215@@ -0,0 +1,22 @@ 
    22162216+# 
     
    22362236+dep_tristate '    ebt: redirect target support' CONFIG_BRIDGE_EBT_REDIRECT $CONFIG_BRIDGE_NF_EBTABLES 
    22372237+dep_tristate '    ebt: mark target support' CONFIG_BRIDGE_EBT_MARK_T $CONFIG_BRIDGE_NF_EBTABLES 
    2238 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/Makefile src/linux/linux/net/bridge/netfilter/Makefile 
    2239 --- src/linux/linux.stock/net/bridge/netfilter/Makefile 1969-12-31 19:00:00.000000000 -0500 
    2240 +++ src/linux/linux/net/bridge/netfilter/Makefile       2004-07-10 23:46:39.000000000 -0400 
     2238diff -Nurb linux.stock/net/bridge/netfilter/Makefile linux/net/bridge/netfilter/Makefile 
     2239--- linux.stock/net/bridge/netfilter/Makefile   1969-12-31 19:00:00.000000000 -0500 
     2240+++ linux/net/bridge/netfilter/Makefile 2004-07-10 23:46:39.000000000 -0400 
    22412241@@ -0,0 +1,33 @@ 
    22422242+# 
     
    22732273+obj-$(CONFIG_BRIDGE_EBT_SNAT) += ebt_snat.o 
    22742274+include $(TOPDIR)/Rules.make 
    2275 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_802_3.c src/linux/linux/net/bridge/netfilter/ebt_802_3.c 
    2276 --- src/linux/linux.stock/net/bridge/netfilter/ebt_802_3.c      1969-12-31 19:00:00.000000000 -0500 
    2277 +++ src/linux/linux/net/bridge/netfilter/ebt_802_3.c    2004-07-10 23:46:39.000000000 -0400 
     2275diff -Nurb linux.stock/net/bridge/netfilter/ebt_802_3.c linux/net/bridge/netfilter/ebt_802_3.c 
     2276--- linux.stock/net/bridge/netfilter/ebt_802_3.c        1969-12-31 19:00:00.000000000 -0500 
     2277+++ linux/net/bridge/netfilter/ebt_802_3.c      2004-07-10 23:46:39.000000000 -0400 
    22782278@@ -0,0 +1,74 @@ 
    22792279+/* 
     
    23512351+EXPORT_NO_SYMBOLS; 
    23522352+MODULE_LICENSE("GPL"); 
    2353 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_among.c src/linux/linux/net/bridge/netfilter/ebt_among.c 
    2354 --- src/linux/linux.stock/net/bridge/netfilter/ebt_among.c      1969-12-31 19:00:00.000000000 -0500 
    2355 +++ src/linux/linux/net/bridge/netfilter/ebt_among.c    2004-07-10 23:46:39.000000000 -0400 
     2353diff -Nurb linux.stock/net/bridge/netfilter/ebt_among.c linux/net/bridge/netfilter/ebt_among.c 
     2354--- linux.stock/net/bridge/netfilter/ebt_among.c        1969-12-31 19:00:00.000000000 -0500 
     2355+++ linux/net/bridge/netfilter/ebt_among.c      2004-07-10 23:46:39.000000000 -0400 
    23562356@@ -0,0 +1,223 @@ 
    23572357+/* 
     
    25782578+EXPORT_NO_SYMBOLS; 
    25792579+MODULE_LICENSE("GPL"); 
    2580 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_arp.c src/linux/linux/net/bridge/netfilter/ebt_arp.c 
    2581 --- src/linux/linux.stock/net/bridge/netfilter/ebt_arp.c        1969-12-31 19:00:00.000000000 -0500 
    2582 +++ src/linux/linux/net/bridge/netfilter/ebt_arp.c      2004-07-10 23:46:39.000000000 -0400 
     2580diff -Nurb linux.stock/net/bridge/netfilter/ebt_arp.c linux/net/bridge/netfilter/ebt_arp.c 
     2581--- linux.stock/net/bridge/netfilter/ebt_arp.c  1969-12-31 19:00:00.000000000 -0500 
     2582+++ linux/net/bridge/netfilter/ebt_arp.c        2004-07-10 23:46:39.000000000 -0400 
    25832583@@ -0,0 +1,149 @@ 
    25842584+/* 
     
    27312731+EXPORT_NO_SYMBOLS; 
    27322732+MODULE_LICENSE("GPL"); 
    2733 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_arpreply.c src/linux/linux/net/bridge/netfilter/ebt_arpreply.c 
    2734 --- src/linux/linux.stock/net/bridge/netfilter/ebt_arpreply.c   1969-12-31 19:00:00.000000000 -0500 
    2735 +++ src/linux/linux/net/bridge/netfilter/ebt_arpreply.c 2004-07-10 23:46:39.000000000 -0400 
     2733diff -Nurb linux.stock/net/bridge/netfilter/ebt_arpreply.c linux/net/bridge/netfilter/ebt_arpreply.c 
     2734--- linux.stock/net/bridge/netfilter/ebt_arpreply.c     1969-12-31 19:00:00.000000000 -0500 
     2735+++ linux/net/bridge/netfilter/ebt_arpreply.c   2004-07-10 23:46:39.000000000 -0400 
    27362736@@ -0,0 +1,86 @@ 
    27372737+/* 
     
    28212821+EXPORT_NO_SYMBOLS; 
    28222822+MODULE_LICENSE("GPL"); 
    2823 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_dnat.c src/linux/linux/net/bridge/netfilter/ebt_dnat.c 
    2824 --- src/linux/linux.stock/net/bridge/netfilter/ebt_dnat.c       1969-12-31 19:00:00.000000000 -0500 
    2825 +++ src/linux/linux/net/bridge/netfilter/ebt_dnat.c     2004-07-10 23:46:39.000000000 -0400 
     2823diff -Nurb linux.stock/net/bridge/netfilter/ebt_dnat.c linux/net/bridge/netfilter/ebt_dnat.c 
     2824--- linux.stock/net/bridge/netfilter/ebt_dnat.c 1969-12-31 19:00:00.000000000 -0500 
     2825+++ linux/net/bridge/netfilter/ebt_dnat.c       2004-07-10 23:46:39.000000000 -0400 
    28262826@@ -0,0 +1,65 @@ 
    28272827+/* 
     
    28902890+EXPORT_NO_SYMBOLS; 
    28912891+MODULE_LICENSE("GPL"); 
    2892 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_ip.c src/linux/linux/net/bridge/netfilter/ebt_ip.c 
    2893 --- src/linux/linux.stock/net/bridge/netfilter/ebt_ip.c 1969-12-31 19:00:00.000000000 -0500 
    2894 +++ src/linux/linux/net/bridge/netfilter/ebt_ip.c       2004-07-10 23:46:39.000000000 -0400 
     2892diff -Nurb linux.stock/net/bridge/netfilter/ebt_ip.c linux/net/bridge/netfilter/ebt_ip.c 
     2893--- linux.stock/net/bridge/netfilter/ebt_ip.c   1969-12-31 19:00:00.000000000 -0500 
     2894+++ linux/net/bridge/netfilter/ebt_ip.c 2004-07-10 23:46:39.000000000 -0400 
    28952895@@ -0,0 +1,121 @@ 
    28962896+/* 
     
    30153015+EXPORT_NO_SYMBOLS; 
    30163016+MODULE_LICENSE("GPL"); 
    3017 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_limit.c src/linux/linux/net/bridge/netfilter/ebt_limit.c 
    3018 --- src/linux/linux.stock/net/bridge/netfilter/ebt_limit.c      1969-12-31 19:00:00.000000000 -0500 
    3019 +++ src/linux/linux/net/bridge/netfilter/ebt_limit.c    2004-07-10 23:46:39.000000000 -0400 
     3017diff -Nurb linux.stock/net/bridge/netfilter/ebt_limit.c linux/net/bridge/netfilter/ebt_limit.c 
     3018--- linux.stock/net/bridge/netfilter/ebt_limit.c        1969-12-31 19:00:00.000000000 -0500 
     3019+++ linux/net/bridge/netfilter/ebt_limit.c      2004-07-10 23:46:39.000000000 -0400 
    30203020@@ -0,0 +1,101 @@ 
    30213021+/* 
     
    31203120+EXPORT_NO_SYMBOLS; 
    31213121+MODULE_LICENSE("GPL"); 
    3122 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_log.c src/linux/linux/net/bridge/netfilter/ebt_log.c 
    3123 --- src/linux/linux.stock/net/bridge/netfilter/ebt_log.c        1969-12-31 19:00:00.000000000 -0500 
    3124 +++ src/linux/linux/net/bridge/netfilter/ebt_log.c      2004-07-10 23:46:39.000000000 -0400 
     3122diff -Nurb linux.stock/net/bridge/netfilter/ebt_log.c linux/net/bridge/netfilter/ebt_log.c 
     3123--- linux.stock/net/bridge/netfilter/ebt_log.c  1969-12-31 19:00:00.000000000 -0500 
     3124+++ linux/net/bridge/netfilter/ebt_log.c        2004-07-10 23:46:39.000000000 -0400 
    31253125@@ -0,0 +1,152 @@ 
    31263126+/* 
     
    32763276+EXPORT_NO_SYMBOLS; 
    32773277+MODULE_LICENSE("GPL"); 
    3278 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_mark.c src/linux/linux/net/bridge/netfilter/ebt_mark.c 
    3279 --- src/linux/linux.stock/net/bridge/netfilter/ebt_mark.c       1969-12-31 19:00:00.000000000 -0500 
    3280 +++ src/linux/linux/net/bridge/netfilter/ebt_mark.c     2004-07-10 23:46:39.000000000 -0400 
     3278diff -Nurb linux.stock/net/bridge/netfilter/ebt_mark.c linux/net/bridge/netfilter/ebt_mark.c 
     3279--- linux.stock/net/bridge/netfilter/ebt_mark.c 1969-12-31 19:00:00.000000000 -0500 
     3280+++ linux/net/bridge/netfilter/ebt_mark.c       2004-07-10 23:46:39.000000000 -0400 
    32813281@@ -0,0 +1,66 @@ 
    32823282+/* 
     
    33463346+EXPORT_NO_SYMBOLS; 
    33473347+MODULE_LICENSE("GPL"); 
    3348 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_mark_m.c src/linux/linux/net/bridge/netfilter/ebt_mark_m.c 
    3349 --- src/linux/linux.stock/net/bridge/netfilter/ebt_mark_m.c     1969-12-31 19:00:00.000000000 -0500 
    3350 +++ src/linux/linux/net/bridge/netfilter/ebt_mark_m.c   2004-07-10 23:46:39.000000000 -0400 
     3348diff -Nurb linux.stock/net/bridge/netfilter/ebt_mark_m.c linux/net/bridge/netfilter/ebt_mark_m.c 
     3349--- linux.stock/net/bridge/netfilter/ebt_mark_m.c       1969-12-31 19:00:00.000000000 -0500 
     3350+++ linux/net/bridge/netfilter/ebt_mark_m.c     2004-07-10 23:46:39.000000000 -0400 
    33513351@@ -0,0 +1,61 @@ 
    33523352+/* 
     
    34113411+EXPORT_NO_SYMBOLS; 
    34123412+MODULE_LICENSE("GPL"); 
    3413 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_pkttype.c src/linux/linux/net/bridge/netfilter/ebt_pkttype.c 
    3414 --- src/linux/linux.stock/net/bridge/netfilter/ebt_pkttype.c    1969-12-31 19:00:00.000000000 -0500 
    3415 +++ src/linux/linux/net/bridge/netfilter/ebt_pkttype.c  2004-07-10 23:46:39.000000000 -0400 
     3413diff -Nurb linux.stock/net/bridge/netfilter/ebt_pkttype.c linux/net/bridge/netfilter/ebt_pkttype.c 
     3414--- linux.stock/net/bridge/netfilter/ebt_pkttype.c      1969-12-31 19:00:00.000000000 -0500 
     3415+++ linux/net/bridge/netfilter/ebt_pkttype.c    2004-07-10 23:46:39.000000000 -0400 
    34163416@@ -0,0 +1,60 @@ 
    34173417+/* 
     
    34753475+EXPORT_NO_SYMBOLS; 
    34763476+MODULE_LICENSE("GPL"); 
    3477 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_redirect.c src/linux/linux/net/bridge/netfilter/ebt_redirect.c 
    3478 --- src/linux/linux.stock/net/bridge/netfilter/ebt_redirect.c   1969-12-31 19:00:00.000000000 -0500 
    3479 +++ src/linux/linux/net/bridge/netfilter/ebt_redirect.c 2004-07-10 23:46:39.000000000 -0400 
     3477diff -Nurb linux.stock/net/bridge/netfilter/ebt_redirect.c linux/net/bridge/netfilter/ebt_redirect.c 
     3478--- linux.stock/net/bridge/netfilter/ebt_redirect.c     1969-12-31 19:00:00.000000000 -0500 
     3479+++ linux/net/bridge/netfilter/ebt_redirect.c   2004-07-10 23:46:39.000000000 -0400 
    34803480@@ -0,0 +1,71 @@ 
    34813481+/* 
     
    35503550+EXPORT_NO_SYMBOLS; 
    35513551+MODULE_LICENSE("GPL"); 
    3552 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_snat.c src/linux/linux/net/bridge/netfilter/ebt_snat.c 
    3553 --- src/linux/linux.stock/net/bridge/netfilter/ebt_snat.c       1969-12-31 19:00:00.000000000 -0500 
    3554 +++ src/linux/linux/net/bridge/netfilter/ebt_snat.c     2004-07-10 23:46:39.000000000 -0400 
     3552diff -Nurb linux.stock/net/bridge/netfilter/ebt_snat.c linux/net/bridge/netfilter/ebt_snat.c 
     3553--- linux.stock/net/bridge/netfilter/ebt_snat.c 1969-12-31 19:00:00.000000000 -0500 
     3554+++ linux/net/bridge/netfilter/ebt_snat.c       2004-07-10 23:46:39.000000000 -0400 
    35553555@@ -0,0 +1,64 @@ 
    35563556+/* 
     
    36183618+EXPORT_NO_SYMBOLS; 
    36193619+MODULE_LICENSE("GPL"); 
    3620 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_stp.c src/linux/linux/net/bridge/netfilter/ebt_stp.c 
    3621 --- src/linux/linux.stock/net/bridge/netfilter/ebt_stp.c        1969-12-31 19:00:00.000000000 -0500 
    3622 +++ src/linux/linux/net/bridge/netfilter/ebt_stp.c      2004-07-10 23:46:39.000000000 -0400 
     3620diff -Nurb linux.stock/net/bridge/netfilter/ebt_stp.c linux/net/bridge/netfilter/ebt_stp.c 
     3621--- linux.stock/net/bridge/netfilter/ebt_stp.c  1969-12-31 19:00:00.000000000 -0500 
     3622+++ linux/net/bridge/netfilter/ebt_stp.c        2004-07-10 23:46:39.000000000 -0400 
    36233623@@ -0,0 +1,191 @@ 
    36243624+/* 
     
    38133813+EXPORT_NO_SYMBOLS; 
    38143814+MODULE_LICENSE("GPL"); 
    3815 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebt_vlan.c src/linux/linux/net/bridge/netfilter/ebt_vlan.c 
    3816 --- src/linux/linux.stock/net/bridge/netfilter/ebt_vlan.c       1969-12-31 19:00:00.000000000 -0500 
    3817 +++ src/linux/linux/net/bridge/netfilter/ebt_vlan.c     2004-07-10 23:46:39.000000000 -0400 
     3815diff -Nurb linux.stock/net/bridge/netfilter/ebt_vlan.c linux/net/bridge/netfilter/ebt_vlan.c 
     3816--- linux.stock/net/bridge/netfilter/ebt_vlan.c 1969-12-31 19:00:00.000000000 -0500 
     3817+++ linux/net/bridge/netfilter/ebt_vlan.c       2004-07-10 23:46:39.000000000 -0400 
    38183818@@ -0,0 +1,259 @@ 
    38193819+/* 
     
    40764076+ 
    40774077+EXPORT_NO_SYMBOLS; 
    4078 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebtable_broute.c src/linux/linux/net/bridge/netfilter/ebtable_broute.c 
    4079 --- src/linux/linux.stock/net/bridge/netfilter/ebtable_broute.c 1969-12-31 19:00:00.000000000 -0500 
    4080 +++ src/linux/linux/net/bridge/netfilter/ebtable_broute.c       2004-07-10 23:46:39.000000000 -0400 
     4078diff -Nurb linux.stock/net/bridge/netfilter/ebtable_broute.c linux/net/bridge/netfilter/ebtable_broute.c 
     4079--- linux.stock/net/bridge/netfilter/ebtable_broute.c   1969-12-31 19:00:00.000000000 -0500 
     4080+++ linux/net/bridge/netfilter/ebtable_broute.c 2004-07-10 23:46:39.000000000 -0400 
    40814081@@ -0,0 +1,79 @@ 
    40824082+/* 
     
    41594159+EXPORT_NO_SYMBOLS; 
    41604160+MODULE_LICENSE("GPL"); 
    4161 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebtable_filter.c src/linux/linux/net/bridge/netfilter/ebtable_filter.c 
    4162 --- src/linux/linux.stock/net/bridge/netfilter/ebtable_filter.c 1969-12-31 19:00:00.000000000 -0500 
    4163 +++ src/linux/linux/net/bridge/netfilter/ebtable_filter.c       2004-07-10 23:46:39.000000000 -0400 
     4161diff -Nurb linux.stock/net/bridge/netfilter/ebtable_filter.c linux/net/bridge/netfilter/ebtable_filter.c 
     4162--- linux.stock/net/bridge/netfilter/ebtable_filter.c   1969-12-31 19:00:00.000000000 -0500 
     4163+++ linux/net/bridge/netfilter/ebtable_filter.c 2004-07-10 23:46:39.000000000 -0400 
    41644164@@ -0,0 +1,90 @@ 
    41654165+/* 
     
    42534253+EXPORT_NO_SYMBOLS; 
    42544254+MODULE_LICENSE("GPL"); 
    4255 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebtable_nat.c src/linux/linux/net/bridge/netfilter/ebtable_nat.c 
    4256 --- src/linux/linux.stock/net/bridge/netfilter/ebtable_nat.c    1969-12-31 19:00:00.000000000 -0500 
    4257 +++ src/linux/linux/net/bridge/netfilter/ebtable_nat.c  2004-07-10 23:46:39.000000000 -0400 
     4255diff -Nurb linux.stock/net/bridge/netfilter/ebtable_nat.c linux/net/bridge/netfilter/ebtable_nat.c 
     4256--- linux.stock/net/bridge/netfilter/ebtable_nat.c      1969-12-31 19:00:00.000000000 -0500 
     4257+++ linux/net/bridge/netfilter/ebtable_nat.c    2004-07-10 23:46:39.000000000 -0400 
    42584258@@ -0,0 +1,96 @@ 
    42594259+/* 
     
    43534353+EXPORT_NO_SYMBOLS; 
    43544354+MODULE_LICENSE("GPL"); 
    4355 diff -Nurb src/linux/linux.stock/net/bridge/netfilter/ebtables.c src/linux/linux/net/bridge/netfilter/ebtables.c 
    4356 --- src/linux/linux.stock/net/bridge/netfilter/ebtables.c       1969-12-31 19:00:00.000000000 -0500 
    4357 +++ src/linux/linux/net/bridge/netfilter/ebtables.c     2004-07-10 23:46:39.000000000 -0400 
     4355diff -Nurb linux.stock/net/bridge/netfilter/ebtables.c linux/net/bridge/netfilter/ebtables.c 
     4356--- linux.stock/net/bridge/netfilter/ebtables.c 1969-12-31 19:00:00.000000000 -0500 
     4357+++ linux/net/bridge/netfilter/ebtables.c       2004-07-10 23:46:39.000000000 -0400 
    43584358@@ -0,0 +1,1490 @@ 
    43594359+/* 
     
    58475847+module_exit(fini); 
    58485848+MODULE_LICENSE("GPL"); 
    5849 diff -Nurb src/linux/linux.stock/net/core/dev.c src/linux/linux/net/core/dev.c 
    5850 --- src/linux/linux.stock/net/core/dev.c        2003-10-14 04:02:55.000000000 -0400 
    5851 +++ src/linux/linux/net/core/dev.c      2004-07-10 23:46:39.000000000 -0400 
     5849diff -Nurb linux.stock/net/core/dev.c linux/net/core/dev.c 
     5850--- linux.stock/net/core/dev.c  2003-10-14 04:02:55.000000000 -0400 
     5851+++ linux/net/core/dev.c        2004-07-10 23:46:39.000000000 -0400 
    58525852@@ -1393,7 +1393,7 @@ 
    58535853  
     
    58815881 #endif 
    58825882  
    5883 diff -Nurb src/linux/linux.stock/net/core/netfilter.c src/linux/linux/net/core/netfilter.c 
    5884 --- src/linux/linux.stock/net/core/netfilter.c  2004-07-10 23:29:56.000000000 -0400 
    5885 +++ src/linux/linux/net/core/netfilter.c        2004-07-10 23:46:39.000000000 -0400 
     5883diff -Nurb linux.stock/net/core/netfilter.c linux/net/core/netfilter.c 
     5884--- linux.stock/net/core/netfilter.c    2004-07-10 23:29:56.000000000 -0400 
     5885+++ linux/net/core/netfilter.c  2004-07-10 23:46:39.000000000 -0400 
    58865886@@ -344,10 +344,15 @@ 
    58875887                               const struct net_device *indev, 
     
    59805980  
    59815981        switch (verdict) { 
    5982 diff -Nurb src/linux/linux.stock/net/core/skbuff.c src/linux/linux/net/core/skbuff.c 
    5983 --- src/linux/linux.stock/net/core/skbuff.c     2003-10-14 04:09:32.000000000 -0400 
    5984 +++ src/linux/linux/net/core/skbuff.c   2004-07-10 23:46:39.000000000 -0400 
     5982diff -Nurb linux.stock/net/core/skbuff.c linux/net/core/skbuff.c 
     5983--- linux.stock/net/core/skbuff.c       2003-10-14 04:09:32.000000000 -0400 
     5984+++ linux/net/core/skbuff.c     2004-07-10 23:46:39.000000000 -0400 
    59855985@@ -244,6 +244,9 @@ 
    59865986 #ifdef CONFIG_NETFILTER_DEBUG 
     
    60456045  
    60466046        copy_skb_header(n, skb); 
    6047 diff -Nurb src/linux/linux.stock/net/ipv4/ip_output.c src/linux/linux/net/ipv4/ip_output.c 
    6048 --- src/linux/linux.stock/net/ipv4/ip_output.c  2003-10-14 04:09:33.000000000 -0400 
    6049 +++ src/linux/linux/net/ipv4/ip_output.c        2004-07-10 23:46:39.000000000 -0400 
     6047diff -Nurb linux.stock/net/ipv4/ip_output.c linux/net/ipv4/ip_output.c 
     6048--- linux.stock/net/ipv4/ip_output.c    2003-10-14 04:09:33.000000000 -0400 
     6049+++ linux/net/ipv4/ip_output.c  2004-07-10 23:46:39.000000000 -0400 
    60506050@@ -879,6 +879,10 @@ 
    60516051                /* Connection association is same as pre-frag packet */ 
     
    60596059                skb2->nf_debug = skb->nf_debug; 
    60606060 #endif 
    6061 diff -Nurb src/linux/linux.stock/net/ipv4/netfilter/Config.in src/linux/linux/net/ipv4/netfilter/Config.in 
    6062 --- src/linux/linux.stock/net/ipv4/netfilter/Config.in  2004-07-10 23:30:19.000000000 -0400 
    6063 +++ src/linux/linux/net/ipv4/netfilter/Config.in        2004-07-10 23:46:39.000000000 -0400 
     6061diff -Nurb linux.stock/net/ipv4/netfilter/Config.in linux/net/ipv4/netfilter/Config.in 
     6062--- linux.stock/net/ipv4/netfilter/Config.in    2004-07-10 23:30:19.000000000 -0400 
     6063+++ linux/net/ipv4/netfilter/Config.in  2004-07-10 23:46:39.000000000 -0400 
    60646064@@ -83,6 +83,9 @@ 
    60656065     dep_tristate '  String match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_STRING $CONFIG_IP_NF_IPTABLES 
     
    60726072   dep_tristate '  Packet filtering' CONFIG_IP_NF_FILTER $CONFIG_IP_NF_IPTABLES  
    60736073   if [ "$CONFIG_IP_NF_FILTER" != "n" ]; then 
    6074 diff -Nurb src/linux/linux.stock/net/ipv4/netfilter/Makefile src/linux/linux/net/ipv4/netfilter/Makefile 
    6075 --- src/linux/linux.stock/net/ipv4/netfilter/Makefile   2004-07-10 23:30:19.000000000 -0400 
    6076 +++ src/linux/linux/net/ipv4/netfilter/Makefile 2004-07-10 23:46:39.000000000 -0400 
     6074diff -Nurb linux.stock/net/ipv4/netfilter/Makefile linux/net/ipv4/netfilter/Makefile 
     6075--- linux.stock/net/ipv4/netfilter/Makefile     2004-07-10 23:30:19.000000000 -0400 
     6076+++ linux/net/ipv4/netfilter/Makefile   2004-07-10 23:46:39.000000000 -0400 
    60776077@@ -149,6 +149,8 @@ 
    60786078 obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o 
     
    60846084 obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o 
    60856085 obj-$(CONFIG_IP_NF_TARGET_MIRROR) += ipt_MIRROR.o 
    6086 diff -Nurb src/linux/linux.stock/net/ipv4/netfilter/ip_tables.c src/linux/linux/net/ipv4/netfilter/ip_tables.c 
    6087 --- src/linux/linux.stock/net/ipv4/netfilter/ip_tables.c        2004-07-10 23:29:53.000000000 -0400 
    6088 +++ src/linux/linux/net/ipv4/netfilter/ip_tables.c      2004-07-10 23:46:39.000000000 -0400 
     6086diff -Nurb linux.stock/net/ipv4/netfilter/ip_tables.c linux/net/ipv4/netfilter/ip_tables.c 
     6087--- linux.stock/net/ipv4/netfilter/ip_tables.c  2004-07-10 23:29:53.000000000 -0400 
     6088+++ linux/net/ipv4/netfilter/ip_tables.c        2004-07-10 23:46:39.000000000 -0400 
    60896089@@ -121,12 +121,19 @@ 
    60906090 static inline int 
     
    61826182  
    61836183                        if (IPT_MATCH_ITERATE(e, do_match, 
    6184 diff -Nurb src/linux/linux.stock/net/ipv4/netfilter/ipt_LOG.c src/linux/linux/net/ipv4/netfilter/ipt_LOG.c 
    6185 --- src/linux/linux.stock/net/ipv4/netfilter/ipt_LOG.c  2004-07-10 23:29:56.000000000 -0400 
    6186 +++ src/linux/linux/net/ipv4/netfilter/ipt_LOG.c        2004-07-10 23:46:39.000000000 -0400 
     6184diff -Nurb linux.stock/net/ipv4/netfilter/ipt_LOG.c linux/net/ipv4/netfilter/ipt_LOG.c 
     6185--- linux.stock/net/ipv4/netfilter/ipt_LOG.c    2004-07-10 23:29:56.000000000 -0400 
     6186+++ linux/net/ipv4/netfilter/ipt_LOG.c  2004-07-10 23:46:39.000000000 -0400 
    61876187@@ -319,6 +319,18 @@ 
    61886188               prefix == NULL ? loginfo->prefix : prefix, 
     
    62046204                /* MAC logging for input chain only. */ 
    62056205                printk("MAC="); 
    6206 diff -Nurb src/linux/linux.stock/net/ipv4/netfilter/ipt_physdev.c src/linux/linux/net/ipv4/netfilter/ipt_physdev.c 
    6207 --- src/linux/linux.stock/net/ipv4/netfilter/ipt_physdev.c      1969-12-31 19:00:00.000000000 -0500 
    6208 +++ src/linux/linux/net/ipv4/netfilter/ipt_physdev.c    2004-07-10 23:46:39.000000000 -0400 
     6206diff -Nurb linux.stock/net/ipv4/netfilter/ipt_physdev.c linux/net/ipv4/netfilter/ipt_physdev.c 
     6207--- linux.stock/net/ipv4/netfilter/ipt_physdev.c        1969-12-31 19:00:00.000000000 -0500 
     6208+++ linux/net/ipv4/netfilter/ipt_physdev.c      2004-07-10 23:46:39.000000000 -0400 
    62096209@@ -0,0 +1,127 @@ 
    62106210+/* Kernel module to match the bridge port in and 
  • trunk/obsolete-buildroot/sources/openwrt/patches/wrt54g-router.patch

    r120 r136  
    173173+       rm -f *.o *.so 
    174174+ 
    175 +libshared.so: shutils.o wl.o wl_linux.o defaults.o 
     175+libshared.so: shutils.o wl.o wl_linux.o defaults.o linux_timer.o 
    176176+       $(LD) -shared -o $@ $^ 
    177177+ 
  • trunk/obsolete-buildroot/sources/openwrt/root/etc/init.d/S10boot

    r134 r136  
    2626 
    2727vconfig set_name_type VLAN_PLUS_VID_NO_PAD 
     28 
     29syslogd -C 16  
  • trunk/obsolete-buildroot/sources/openwrt/root/etc/inittab

    r134 r136  
    11::sysinit:/etc/init.d/rcS 
    22::shutdown:/sbin/halt 
    3 ::respawn:/bin/login 
     3ttyS0::respawn:/bin/login 
  • trunk/obsolete-buildroot/sources/openwrt/root/sbin/hotplug

    r134 r136  
    22# $Id$ 
    33[ "${INTERFACE%%[0-9]*}" = "wds" ] && {  
     4        [ -x "/usr/sbin/nas" ] && /usr/sbin/nas lan $INTERFACE up 
    45        ifconfig $INTERFACE 0.0.0.0 up 
    56        /usr/sbin/brctl addif br0 $INTERFACE 
  • trunk/obsolete-buildroot/sources/openwrt/tools/addpattern.c

    r120 r136  
    8585        struct tm *ptm; 
    8686 
    87         fprintf(stderr, "mjn3's addpattern replacement - v0.80\n"); 
     87        fprintf(stderr, "mjn3's addpattern replacement - v0.81\n"); 
    8888 
    8989        hdr = (struct code_header *) buf; 
  • trunk/obsolete-buildroot/sources/openwrt/tools/trx.c

    r120 r136  
    2626 * .trx file using '-m'.  It will be rounded up to be a multiple of 4K. 
    2727 * NOTE: This space will be malloc()'d. 
     28 * 
     29 * August 16, 2004 
     30 * 
     31 * Sigh... Make it endian-neutral. 
    2832 * 
    2933 * TODO: Support '-b' option to specify offsets for each file. 
     
    3741#include <errno.h> 
    3842#include <unistd.h> 
     43#include <endian.h> 
     44#include <byteswap.h> 
     45 
     46#if __BYTE_ORDER == __BIG_ENDIAN 
     47#define STORE32_LE(X)           bswap_32(X) 
     48#elif __BYTE_ORDER == __LITTLE_ENDIAN 
     49#define STORE32_LE(X)           (X) 
     50#else 
     51#error unkown endianness! 
     52#endif 
    3953 
    4054uint32_t crc32buf(char *buf, size_t len); 
     
    7589        int c, i; 
    7690        size_t n; 
     91        uint32_t cur_len; 
    7792        unsigned long maxlen = TRX_MAX_LEN; 
    7893        struct trx_header *p; 
    7994 
    80         fprintf(stderr, "mjn3's trx replacement - v0.80\n"); 
     95        fprintf(stderr, "mjn3's trx replacement - v0.81\n"); 
    8196 
    8297        while ((c = getopt(argc, argv, "o:m:")) != -1) { 
     
    133148        p = (struct trx_header *) buf; 
    134149 
    135         p->magic = TRX_MAGIC; 
    136         p->len = sizeof(struct trx_header); 
    137         p->flag_version = (TRX_VERSION << 16); 
     150        p->magic = STORE32_LE(TRX_MAGIC); 
     151        cur_len = sizeof(struct trx_header); 
     152        p->flag_version = STORE32_LE((TRX_VERSION << 16)); 
    138153 
    139154        i = 0; 
    140155 
    141156        while (optind < argc) { 
    142                 p->offsets[i++] = p->len; 
     157                p->offsets[i++] = STORE32_LE(cur_len); 
    143158 
    144159                if (!(in = fopen(argv[optind], "r"))) { 
     
    147162                } 
    148163 
    149                 n = fread(buf + p->len, 1, maxlen - p->len, in); 
     164                n = fread(buf + cur_len, 1, maxlen - cur_len, in); 
    150165                if (!feof(in)) { 
    151166                        fprintf(stderr, "fread failure or file \"%s\" too large\n", 
     
    163178#define ROUND 4 
    164179                        if (n & (ROUND-1)) { 
    165                                 memset(buf + p->len + n, 0, ROUND - (n & (ROUND-1))); 
     180                                memset(buf + cur_len + n, 0, ROUND - (n & (ROUND-1))); 
    166181                                n += ROUND - (n & (ROUND-1)); 
    167182                        } 
    168183                } 
    169184 
    170                 p->len += n; 
     185                cur_len += n; 
    171186        } 
    172187 
    173188#undef  ROUND 
    174189#define ROUND 0x1000 
    175         n = p->len & (ROUND-1); 
     190        n = cur_len & (ROUND-1); 
    176191        if (n) { 
    177                 memset(buf + p->len, 0, ROUND - n); 
    178                 p->len += ROUND - n; 
     192                memset(buf + cur_len, 0, ROUND - n); 
     193                cur_len += ROUND - n; 
    179194        } 
    180195 
    181196        p->crc32 = crc32buf((char *) &p->flag_version, 
    182                                                 p->len - offsetof(struct trx_header, flag_version)); 
    183  
    184         if (!fwrite(buf, p->len, 1, out) || fflush(out)) { 
     197                                                cur_len - offsetof(struct trx_header, flag_version)); 
     198        p->crc32 = STORE32_LE(p->crc32); 
     199 
     200        p->len = STORE32_LE(cur_len); 
     201 
     202        if (!fwrite(buf, cur_len, 1, out) || fflush(out)) { 
    185203                fprintf(stderr, "fwrite failed\n"); 
    186204                return EXIT_FAILURE; 
Note: See TracChangeset for help on using the changeset viewer.