-Index: linux-2.4.35.4/arch/mips/au1000/common/au1xxx_irqmap.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/common/au1xxx_irqmap.c
-+++ linux-2.4.35.4/arch/mips/au1000/common/au1xxx_irqmap.c
+--- a/arch/mips/au1000/common/au1xxx_irqmap.c
++++ b/arch/mips/au1000/common/au1xxx_irqmap.c
@@ -172,14 +172,14 @@ au1xxx_irq_map_t au1xxx_ic0_map[] = {
{ AU1550_PSC1_INT, INTC_INT_HIGH_LEVEL, 0},
{ AU1550_PSC2_INT, INTC_INT_HIGH_LEVEL, 0},
{ AU1200_NAND_INT, INTC_INT_RISE_EDGE, 0},
{ AU1200_USB_INT, INTC_INT_HIGH_LEVEL, 0 },
{ AU1200_LCD_INT, INTC_INT_HIGH_LEVEL, 0},
-Index: linux-2.4.35.4/arch/mips/au1000/common/cputable.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/common/cputable.c
-+++ linux-2.4.35.4/arch/mips/au1000/common/cputable.c
+--- a/arch/mips/au1000/common/cputable.c
++++ b/arch/mips/au1000/common/cputable.c
@@ -39,7 +39,8 @@ struct cpu_spec cpu_specs[] = {
{ 0xffffffff, 0x02030203, "Au1100 BD", 0, 1 },
{ 0xffffffff, 0x02030204, "Au1100 BE", 0, 1 },
{ 0x00000000, 0x00000000, "Unknown Au1xxx", 1, 0 },
};
-Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/common/dbdma.c
-+++ linux-2.4.35.4/arch/mips/au1000/common/dbdma.c
+--- a/arch/mips/au1000/common/dbdma.c
++++ b/arch/mips/au1000/common/dbdma.c
@@ -41,6 +41,8 @@
#include <asm/au1xxx_dbdma.h>
#include <asm/system.h>
+
#endif /* defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) */
-Index: linux-2.4.35.4/arch/mips/au1000/common/gpio.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/au1000/common/gpio.c
++++ b/arch/mips/au1000/common/gpio.c
@@ -0,0 +1,118 @@
+/*
+ * This program is free software; you can redistribute it and/or modify it
+EXPORT_SYMBOL(au1xxx_gpio_tristate);
+EXPORT_SYMBOL(au1xxx_gpio_write);
+EXPORT_SYMBOL(au1xxx_gpio_read);
-Index: linux-2.4.35.4/arch/mips/au1000/common/irq.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/common/irq.c
-+++ linux-2.4.35.4/arch/mips/au1000/common/irq.c
+--- a/arch/mips/au1000/common/irq.c
++++ b/arch/mips/au1000/common/irq.c
@@ -303,8 +303,30 @@ static struct hw_interrupt_type level_ir
};
}
-Index: linux-2.4.35.4/arch/mips/au1000/common/Makefile
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/common/Makefile
-+++ linux-2.4.35.4/arch/mips/au1000/common/Makefile
+--- a/arch/mips/au1000/common/Makefile
++++ b/arch/mips/au1000/common/Makefile
@@ -19,9 +19,9 @@ O_TARGET := au1000.o
export-objs = prom.o clocks.o power.o usbdev.o
obj-$(CONFIG_AU1X00_USB_DEVICE) += usbdev.o
obj-$(CONFIG_KGDB) += dbg_io.o
-Index: linux-2.4.35.4/arch/mips/au1000/common/pci_fixup.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/common/pci_fixup.c
-+++ linux-2.4.35.4/arch/mips/au1000/common/pci_fixup.c
+--- a/arch/mips/au1000/common/pci_fixup.c
++++ b/arch/mips/au1000/common/pci_fixup.c
@@ -75,9 +75,13 @@ void __init pcibios_fixup(void)
#ifdef CONFIG_NONCOHERENT_IO
printk("Non-coherent PCI accesses enabled\n");
#endif
-Index: linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/common/pci_ops.c
-+++ linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c
+--- a/arch/mips/au1000/common/pci_ops.c
++++ b/arch/mips/au1000/common/pci_ops.c
@@ -162,6 +162,7 @@ unsigned long last_entryLo0, last_entryL
static int config_access(unsigned char access_type, struct pci_dev *dev,
unsigned char where, u32 * data)
}
#endif
-Index: linux-2.4.35.4/arch/mips/au1000/common/power.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/common/power.c
-+++ linux-2.4.35.4/arch/mips/au1000/common/power.c
+--- a/arch/mips/au1000/common/power.c
++++ b/arch/mips/au1000/common/power.c
@@ -50,7 +50,6 @@
static void calibrate_delay(void);
{0}
};
-Index: linux-2.4.35.4/arch/mips/au1000/common/reset.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/common/reset.c
-+++ linux-2.4.35.4/arch/mips/au1000/common/reset.c
+--- a/arch/mips/au1000/common/reset.c
++++ b/arch/mips/au1000/common/reset.c
@@ -37,8 +37,6 @@
#include <asm/system.h>
#include <asm/au1000.h>
+ /* If board can't power-off, spin forever */
au1000_halt();
}
-Index: linux-2.4.35.4/arch/mips/au1000/common/setup.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/common/setup.c
-+++ linux-2.4.35.4/arch/mips/au1000/common/setup.c
+--- a/arch/mips/au1000/common/setup.c
++++ b/arch/mips/au1000/common/setup.c
@@ -174,6 +174,40 @@ void __init au1x00_setup(void)
initrd_end = (unsigned long)&__rd_end;
#endif
if ((ide_ops == NULL) || (ide_ops == &no_ide_ops))
ide_ops = &std_ide_ops;
#endif
-Index: linux-2.4.35.4/arch/mips/au1000/common/sleeper.S
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/common/sleeper.S
-+++ linux-2.4.35.4/arch/mips/au1000/common/sleeper.S
+--- a/arch/mips/au1000/common/sleeper.S
++++ b/arch/mips/au1000/common/sleeper.S
@@ -15,17 +15,48 @@
#include <asm/addrspace.h>
#include <asm/regdef.h>
+ .set reorder
END(save_and_sleep)
+
-Index: linux-2.4.35.4/arch/mips/au1000/common/time.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/common/time.c
-+++ linux-2.4.35.4/arch/mips/au1000/common/time.c
+--- a/arch/mips/au1000/common/time.c
++++ b/arch/mips/au1000/common/time.c
@@ -50,7 +50,6 @@
#include <linux/mc146818rtc.h>
#include <linux/timex.h>
}
#else
-Index: linux-2.4.35.4/arch/mips/au1000/db1x00/board_setup.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/db1x00/board_setup.c
-+++ linux-2.4.35.4/arch/mips/au1000/db1x00/board_setup.c
+--- a/arch/mips/au1000/db1x00/board_setup.c
++++ b/arch/mips/au1000/db1x00/board_setup.c
@@ -46,10 +46,22 @@
#include <asm/au1000.h>
#include <asm/db1x00.h>
#ifdef CONFIG_MIPS_DB1000
printk("AMD Alchemy Au1000/Db1000 Board\n");
#endif
-Index: linux-2.4.35.4/arch/mips/au1000/db1x00/irqmap.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/db1x00/irqmap.c
-+++ linux-2.4.35.4/arch/mips/au1000/db1x00/irqmap.c
+--- a/arch/mips/au1000/db1x00/irqmap.c
++++ b/arch/mips/au1000/db1x00/irqmap.c
@@ -53,6 +53,7 @@ au1xxx_irq_map_t au1xxx_irq_map[] = {
#ifdef CONFIG_MIPS_DB1550
{ AU1000_GPIO_3, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 IRQ#
#else
{ AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 Fully_Interted#
{ AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 STSCHG#
-Index: linux-2.4.35.4/arch/mips/au1000/db1x00/Makefile
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/db1x00/Makefile
-+++ linux-2.4.35.4/arch/mips/au1000/db1x00/Makefile
+--- a/arch/mips/au1000/db1x00/Makefile
++++ b/arch/mips/au1000/db1x00/Makefile
@@ -17,4 +17,11 @@ O_TARGET := db1x00.o
obj-y := init.o board_setup.o irqmap.o
obj-$(CONFIG_WM97XX_COMODULE) += mirage_ts.o
+endif
+
include $(TOPDIR)/Rules.make
-Index: linux-2.4.35.4/arch/mips/au1000/db1x00/mmc_support.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/au1000/db1x00/mmc_support.c
++++ b/arch/mips/au1000/db1x00/mmc_support.c
@@ -0,0 +1,126 @@
+/*
+ * BRIEF MODULE DESCRIPTION
+EXPORT_SYMBOL(mmc_power_on);
+EXPORT_SYMBOL(mmc_power_off);
+
-Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/au1200_ibutton.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/au1200_ibutton.c
++++ b/arch/mips/au1000/ficmmp/au1200_ibutton.c
@@ -0,0 +1,270 @@
+/* ----------------------------------------------------------------------
+ * mtwilson_keys.c
+MODULE_AUTHOR( DRIVER_AUTHOR );
+MODULE_DESCRIPTION( DRIVER_DESC );
+MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/au1xxx_dock.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/au1xxx_dock.c
++++ b/arch/mips/au1000/ficmmp/au1xxx_dock.c
@@ -0,0 +1,261 @@
+/*
+ * Copyright (C) 2003 Metrowerks, All Rights Reserved.
+
+module_init(au1xxx_dock_init);
+module_exit(au1xxx_dock_exit);
-Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/board_setup.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/board_setup.c
++++ b/arch/mips/au1000/ficmmp/board_setup.c
@@ -0,0 +1,226 @@
+/*
+ *
+ return 0;
+}
+
-Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/init.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/init.c
++++ b/arch/mips/au1000/ficmmp/init.c
@@ -0,0 +1,76 @@
+/*
+ *
+ return 0;
+}
+
-Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/irqmap.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/irqmap.c
++++ b/arch/mips/au1000/ficmmp/irqmap.c
@@ -0,0 +1,61 @@
+/*
+ * BRIEF MODULE DESCRIPTION
+
+int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);
+
-Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/Makefile
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/Makefile
++++ b/arch/mips/au1000/ficmmp/Makefile
@@ -0,0 +1,25 @@
+#
+# Copyright 2000 MontaVista Software Inc.
+
+
+include $(TOPDIR)/Rules.make
-Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/board_setup.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/hydrogen3/board_setup.c
-+++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/board_setup.c
+--- a/arch/mips/au1000/hydrogen3/board_setup.c
++++ b/arch/mips/au1000/hydrogen3/board_setup.c
@@ -51,12 +51,19 @@ void board_reset (void)
{
}
#ifdef CONFIG_AU1X00_USB_DEVICE
// 2nd USB port is USB device
pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000);
-Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/buttons.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/buttons.c
++++ b/arch/mips/au1000/hydrogen3/buttons.c
@@ -0,0 +1,308 @@
+/*
+ * Copyright (C) 2003 Metrowerks, All Rights Reserved.
+
+module_init(hydrogen3_buttons_init);
+module_exit(hydrogen3_buttons_exit);
-Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/Makefile
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/hydrogen3/Makefile
-+++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/Makefile
+--- a/arch/mips/au1000/hydrogen3/Makefile
++++ b/arch/mips/au1000/hydrogen3/Makefile
@@ -14,6 +14,11 @@ USE_STANDARD_AS_RULE := true
O_TARGET := hydrogen3.o
+endif
include $(TOPDIR)/Rules.make
-Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/mmc_support.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/mmc_support.c
++++ b/arch/mips/au1000/hydrogen3/mmc_support.c
@@ -0,0 +1,89 @@
+/*
+ * BRIEF MODULE DESCRIPTION
+EXPORT_SYMBOL(mmc_power_on);
+EXPORT_SYMBOL(mmc_power_off);
+
-Index: linux-2.4.35.4/arch/mips/au1000/mtx-1/board_setup.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/mtx-1/board_setup.c
-+++ linux-2.4.35.4/arch/mips/au1000/mtx-1/board_setup.c
+--- a/arch/mips/au1000/mtx-1/board_setup.c
++++ b/arch/mips/au1000/mtx-1/board_setup.c
@@ -48,6 +48,12 @@
extern struct rtc_ops no_rtc_ops;
void __init board_setup(void)
{
rtc_ops = &no_rtc_ops;
-Index: linux-2.4.35.4/arch/mips/au1000/mtx-1/irqmap.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/mtx-1/irqmap.c
-+++ linux-2.4.35.4/arch/mips/au1000/mtx-1/irqmap.c
+--- a/arch/mips/au1000/mtx-1/irqmap.c
++++ b/arch/mips/au1000/mtx-1/irqmap.c
@@ -72,10 +72,10 @@ au1xxx_pci_irqmap(struct pci_dev *dev, u
* A B C D
*/
};
const long min_idsel = 0, max_idsel = 3, irqs_per_slot = 4;
return PCI_IRQ_TABLE_LOOKUP;
-Index: linux-2.4.35.4/arch/mips/au1000/pb1000/board_setup.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/pb1000/board_setup.c
-+++ linux-2.4.35.4/arch/mips/au1000/pb1000/board_setup.c
+--- a/arch/mips/au1000/pb1000/board_setup.c
++++ b/arch/mips/au1000/pb1000/board_setup.c
@@ -58,6 +58,10 @@ void board_reset (void)
{
}
void __init board_setup(void)
{
u32 pin_func, static_cfg0;
-Index: linux-2.4.35.4/arch/mips/au1000/pb1100/board_setup.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/pb1100/board_setup.c
-+++ linux-2.4.35.4/arch/mips/au1000/pb1100/board_setup.c
+--- a/arch/mips/au1000/pb1100/board_setup.c
++++ b/arch/mips/au1000/pb1100/board_setup.c
@@ -62,6 +62,10 @@ void board_reset (void)
au_writel(0x00000000, 0xAE00001C);
}
void __init board_setup(void)
{
u32 pin_func;
-Index: linux-2.4.35.4/arch/mips/au1000/pb1100/Makefile
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/pb1100/Makefile
-+++ linux-2.4.35.4/arch/mips/au1000/pb1100/Makefile
+--- a/arch/mips/au1000/pb1100/Makefile
++++ b/arch/mips/au1000/pb1100/Makefile
@@ -16,4 +16,10 @@ O_TARGET := pb1100.o
obj-y := init.o board_setup.o irqmap.o
+endif
+
include $(TOPDIR)/Rules.make
-Index: linux-2.4.35.4/arch/mips/au1000/pb1100/mmc_support.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/au1000/pb1100/mmc_support.c
++++ b/arch/mips/au1000/pb1100/mmc_support.c
@@ -0,0 +1,126 @@
+/*
+ * BRIEF MODULE DESCRIPTION
+EXPORT_SYMBOL(mmc_power_on);
+EXPORT_SYMBOL(mmc_power_off);
+
-Index: linux-2.4.35.4/arch/mips/au1000/pb1200/board_setup.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/au1000/pb1200/board_setup.c
++++ b/arch/mips/au1000/pb1200/board_setup.c
@@ -0,0 +1,221 @@
+/*
+ *
+ return 0;
+}
+
-Index: linux-2.4.35.4/arch/mips/au1000/pb1200/init.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/au1000/pb1200/init.c
++++ b/arch/mips/au1000/pb1200/init.c
@@ -0,0 +1,72 @@
+/*
+ *
+ return 0;
+}
+
-Index: linux-2.4.35.4/arch/mips/au1000/pb1200/irqmap.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/au1000/pb1200/irqmap.c
++++ b/arch/mips/au1000/pb1200/irqmap.c
@@ -0,0 +1,180 @@
+/*
+ * BRIEF MODULE DESCRIPTION
+ request of any source attached to the cascade */
+}
+
-Index: linux-2.4.35.4/arch/mips/au1000/pb1200/Makefile
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/au1000/pb1200/Makefile
++++ b/arch/mips/au1000/pb1200/Makefile
@@ -0,0 +1,25 @@
+#
+# Copyright 2000 MontaVista Software Inc.
+
+
+include $(TOPDIR)/Rules.make
-Index: linux-2.4.35.4/arch/mips/au1000/pb1200/mmc_support.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/au1000/pb1200/mmc_support.c
++++ b/arch/mips/au1000/pb1200/mmc_support.c
@@ -0,0 +1,141 @@
+/*
+ * BRIEF MODULE DESCRIPTION
+EXPORT_SYMBOL(mmc_power_on);
+EXPORT_SYMBOL(mmc_power_off);
+
-Index: linux-2.4.35.4/arch/mips/au1000/pb1500/board_setup.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/pb1500/board_setup.c
-+++ linux-2.4.35.4/arch/mips/au1000/pb1500/board_setup.c
+--- a/arch/mips/au1000/pb1500/board_setup.c
++++ b/arch/mips/au1000/pb1500/board_setup.c
@@ -62,6 +62,10 @@ void board_reset (void)
au_writel(0x00000000, 0xAE00001C);
}
void __init board_setup(void)
{
u32 pin_func;
-Index: linux-2.4.35.4/arch/mips/au1000/pb1550/board_setup.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/pb1550/board_setup.c
-+++ linux-2.4.35.4/arch/mips/au1000/pb1550/board_setup.c
+--- a/arch/mips/au1000/pb1550/board_setup.c
++++ b/arch/mips/au1000/pb1550/board_setup.c
@@ -48,12 +48,31 @@
extern struct rtc_ops no_rtc_ops;
+#endif
printk("AMD Alchemy Pb1550 Board\n");
}
-Index: linux-2.4.35.4/arch/mips/au1000/pb1550/irqmap.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/au1000/pb1550/irqmap.c
-+++ linux-2.4.35.4/arch/mips/au1000/pb1550/irqmap.c
+--- a/arch/mips/au1000/pb1550/irqmap.c
++++ b/arch/mips/au1000/pb1550/irqmap.c
@@ -50,6 +50,9 @@
au1xxx_irq_map_t au1xxx_irq_map[] = {
{ AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 },
};
int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);
-Index: linux-2.4.35.4/arch/mips/config-shared.in
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/config-shared.in
-+++ linux-2.4.35.4/arch/mips/config-shared.in
+--- a/arch/mips/config-shared.in
++++ b/arch/mips/config-shared.in
@@ -21,16 +21,19 @@ mainmenu_option next_comment
comment 'Machine selection'
dep_bool 'Support for Acer PICA 1 chipset (EXPERIMENTAL)' CONFIG_ACER_PICA_61 $CONFIG_EXPERIMENTAL
"$CONFIG_NEC_OSPREY" = "y" -o \
"$CONFIG_NEC_EAGLE" = "y" -o \
"$CONFIG_NINO" = "y" -o \
-Index: linux-2.4.35.4/arch/mips/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig
-+++ linux-2.4.35.4/arch/mips/defconfig
+--- a/arch/mips/defconfig
++++ b/arch/mips/defconfig
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-atlas
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-atlas
-+++ linux-2.4.35.4/arch/mips/defconfig-atlas
+--- a/arch/mips/defconfig-atlas
++++ b/arch/mips/defconfig-atlas
@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-bosporus
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-bosporus
-+++ linux-2.4.35.4/arch/mips/defconfig-bosporus
+--- a/arch/mips/defconfig-bosporus
++++ b/arch/mips/defconfig-bosporus
@@ -30,8 +30,8 @@ CONFIG_MIPS_BOSPORUS=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-capcella
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-capcella
-+++ linux-2.4.35.4/arch/mips/defconfig-capcella
+--- a/arch/mips/defconfig-capcella
++++ b/arch/mips/defconfig-capcella
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_VR41XX_KIU is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-cobalt
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-cobalt
-+++ linux-2.4.35.4/arch/mips/defconfig-cobalt
+--- a/arch/mips/defconfig-cobalt
++++ b/arch/mips/defconfig-cobalt
@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=16
-Index: linux-2.4.35.4/arch/mips/defconfig-csb250
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-csb250
-+++ linux-2.4.35.4/arch/mips/defconfig-csb250
+--- a/arch/mips/defconfig-csb250
++++ b/arch/mips/defconfig-csb250
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-db1000
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-db1000
-+++ linux-2.4.35.4/arch/mips/defconfig-db1000
+--- a/arch/mips/defconfig-db1000
++++ b/arch/mips/defconfig-db1000
@@ -30,8 +30,8 @@ CONFIG_MIPS_DB1000=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-db1100
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-db1100
-+++ linux-2.4.35.4/arch/mips/defconfig-db1100
+--- a/arch/mips/defconfig-db1100
++++ b/arch/mips/defconfig-db1100
@@ -30,8 +30,8 @@ CONFIG_MIPS_DB1100=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_FB_IT8181 is not set
# CONFIG_FB_VIRTUAL is not set
CONFIG_FBCON_ADVANCED=y
-Index: linux-2.4.35.4/arch/mips/defconfig-db1200
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/defconfig-db1200
++++ b/arch/mips/defconfig-db1200
@@ -0,0 +1,1032 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
+# CONFIG_FW_LOADER is not set
-Index: linux-2.4.35.4/arch/mips/defconfig-db1500
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-db1500
-+++ linux-2.4.35.4/arch/mips/defconfig-db1500
+--- a/arch/mips/defconfig-db1500
++++ b/arch/mips/defconfig-db1500
@@ -30,8 +30,8 @@ CONFIG_MIPS_DB1500=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-db1550
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-db1550
-+++ linux-2.4.35.4/arch/mips/defconfig-db1550
+--- a/arch/mips/defconfig-db1550
++++ b/arch/mips/defconfig-db1550
@@ -30,8 +30,8 @@ CONFIG_MIPS_DB1550=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-ddb5476
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-ddb5476
-+++ linux-2.4.35.4/arch/mips/defconfig-ddb5476
+--- a/arch/mips/defconfig-ddb5476
++++ b/arch/mips/defconfig-ddb5476
@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-ddb5477
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-ddb5477
-+++ linux-2.4.35.4/arch/mips/defconfig-ddb5477
+--- a/arch/mips/defconfig-ddb5477
++++ b/arch/mips/defconfig-ddb5477
@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-decstation
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-decstation
-+++ linux-2.4.35.4/arch/mips/defconfig-decstation
+--- a/arch/mips/defconfig-decstation
++++ b/arch/mips/defconfig-decstation
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-e55
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-e55
-+++ linux-2.4.35.4/arch/mips/defconfig-e55
+--- a/arch/mips/defconfig-e55
++++ b/arch/mips/defconfig-e55
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_VR41XX_KIU is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-eagle
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-eagle
-+++ linux-2.4.35.4/arch/mips/defconfig-eagle
+--- a/arch/mips/defconfig-eagle
++++ b/arch/mips/defconfig-eagle
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_VR41XX_KIU is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-ev64120
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-ev64120
-+++ linux-2.4.35.4/arch/mips/defconfig-ev64120
+--- a/arch/mips/defconfig-ev64120
++++ b/arch/mips/defconfig-ev64120
@@ -30,8 +30,8 @@ CONFIG_MODULES=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-ev96100
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-ev96100
-+++ linux-2.4.35.4/arch/mips/defconfig-ev96100
+--- a/arch/mips/defconfig-ev96100
++++ b/arch/mips/defconfig-ev96100
@@ -30,8 +30,8 @@ CONFIG_MODULES=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-ficmmp
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/defconfig-ficmmp
++++ b/arch/mips/defconfig-ficmmp
@@ -0,0 +1,862 @@
+#
+# Automatically generated make config: don't edit
+# CONFIG_CRC32 is not set
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
-Index: linux-2.4.35.4/arch/mips/defconfig-hp-lj
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-hp-lj
-+++ linux-2.4.35.4/arch/mips/defconfig-hp-lj
+--- a/arch/mips/defconfig-hp-lj
++++ b/arch/mips/defconfig-hp-lj
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_UNIX98_PTYS is not set
#
-Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-hydrogen3
-+++ linux-2.4.35.4/arch/mips/defconfig-hydrogen3
+--- a/arch/mips/defconfig-hydrogen3
++++ b/arch/mips/defconfig-hydrogen3
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_FB_IT8181 is not set
# CONFIG_FB_VIRTUAL is not set
CONFIG_FBCON_ADVANCED=y
-Index: linux-2.4.35.4/arch/mips/defconfig-ip22
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-ip22
-+++ linux-2.4.35.4/arch/mips/defconfig-ip22
+--- a/arch/mips/defconfig-ip22
++++ b/arch/mips/defconfig-ip22
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-it8172
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-it8172
-+++ linux-2.4.35.4/arch/mips/defconfig-it8172
+--- a/arch/mips/defconfig-it8172
++++ b/arch/mips/defconfig-it8172
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-ivr
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-ivr
-+++ linux-2.4.35.4/arch/mips/defconfig-ivr
+--- a/arch/mips/defconfig-ivr
++++ b/arch/mips/defconfig-ivr
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-jmr3927
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-jmr3927
-+++ linux-2.4.35.4/arch/mips/defconfig-jmr3927
+--- a/arch/mips/defconfig-jmr3927
++++ b/arch/mips/defconfig-jmr3927
@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_UNIX98_PTYS is not set
#
-Index: linux-2.4.35.4/arch/mips/defconfig-lasat
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-lasat
-+++ linux-2.4.35.4/arch/mips/defconfig-lasat
+--- a/arch/mips/defconfig-lasat
++++ b/arch/mips/defconfig-lasat
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-malta
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-malta
-+++ linux-2.4.35.4/arch/mips/defconfig-malta
+--- a/arch/mips/defconfig-malta
++++ b/arch/mips/defconfig-malta
@@ -22,16 +22,19 @@ CONFIG_KMOD=y
#
# CONFIG_ACER_PICA_61 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-mirage
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-mirage
-+++ linux-2.4.35.4/arch/mips/defconfig-mirage
+--- a/arch/mips/defconfig-mirage
++++ b/arch/mips/defconfig-mirage
@@ -30,8 +30,8 @@ CONFIG_MIPS_MIRAGE=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-mpc30x
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-mpc30x
-+++ linux-2.4.35.4/arch/mips/defconfig-mpc30x
+--- a/arch/mips/defconfig-mpc30x
++++ b/arch/mips/defconfig-mpc30x
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_VR41XX_KIU is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-mtx-1
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-mtx-1
-+++ linux-2.4.35.4/arch/mips/defconfig-mtx-1
+--- a/arch/mips/defconfig-mtx-1
++++ b/arch/mips/defconfig-mtx-1
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-nino
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-nino
-+++ linux-2.4.35.4/arch/mips/defconfig-nino
+--- a/arch/mips/defconfig-nino
++++ b/arch/mips/defconfig-nino
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_UNIX98_PTYS is not set
#
-Index: linux-2.4.35.4/arch/mips/defconfig-ocelot
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-ocelot
-+++ linux-2.4.35.4/arch/mips/defconfig-ocelot
+--- a/arch/mips/defconfig-ocelot
++++ b/arch/mips/defconfig-ocelot
@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-osprey
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-osprey
-+++ linux-2.4.35.4/arch/mips/defconfig-osprey
+--- a/arch/mips/defconfig-osprey
++++ b/arch/mips/defconfig-osprey
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_VR41XX_KIU is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-pb1000
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-pb1000
-+++ linux-2.4.35.4/arch/mips/defconfig-pb1000
+--- a/arch/mips/defconfig-pb1000
++++ b/arch/mips/defconfig-pb1000
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
CONFIG_MIPS_PB1000=y
# CONFIG_MIPS_PB1100 is not set
# CONFIG_TS_AU1X00_ADS7846 is not set
#
-Index: linux-2.4.35.4/arch/mips/defconfig-pb1100
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-pb1100
-+++ linux-2.4.35.4/arch/mips/defconfig-pb1100
+--- a/arch/mips/defconfig-pb1100
++++ b/arch/mips/defconfig-pb1100
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
CONFIG_MIPS_PB1100=y
# CONFIG_FB_IT8181 is not set
# CONFIG_FB_VIRTUAL is not set
CONFIG_FBCON_ADVANCED=y
-Index: linux-2.4.35.4/arch/mips/defconfig-pb1200
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/defconfig-pb1200
++++ b/arch/mips/defconfig-pb1200
@@ -0,0 +1,1060 @@
+#
+# Automatically generated make config: don't edit
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
+# CONFIG_FW_LOADER is not set
-Index: linux-2.4.35.4/arch/mips/defconfig-pb1500
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-pb1500
-+++ linux-2.4.35.4/arch/mips/defconfig-pb1500
+--- a/arch/mips/defconfig-pb1500
++++ b/arch/mips/defconfig-pb1500
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-pb1550
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-pb1550
-+++ linux-2.4.35.4/arch/mips/defconfig-pb1550
+--- a/arch/mips/defconfig-pb1550
++++ b/arch/mips/defconfig-pb1550
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-rbtx4927
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-rbtx4927
-+++ linux-2.4.35.4/arch/mips/defconfig-rbtx4927
+--- a/arch/mips/defconfig-rbtx4927
++++ b/arch/mips/defconfig-rbtx4927
@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_UNIX98_PTYS is not set
#
-Index: linux-2.4.35.4/arch/mips/defconfig-rm200
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-rm200
-+++ linux-2.4.35.4/arch/mips/defconfig-rm200
+--- a/arch/mips/defconfig-rm200
++++ b/arch/mips/defconfig-rm200
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-sb1250-swarm
-+++ linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm
+--- a/arch/mips/defconfig-sb1250-swarm
++++ b/arch/mips/defconfig-sb1250-swarm
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-sead
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-sead
-+++ linux-2.4.35.4/arch/mips/defconfig-sead
+--- a/arch/mips/defconfig-sead
++++ b/arch/mips/defconfig-sead
@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_UNIX98_PTYS is not set
#
-Index: linux-2.4.35.4/arch/mips/defconfig-stretch
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-stretch
-+++ linux-2.4.35.4/arch/mips/defconfig-stretch
+--- a/arch/mips/defconfig-stretch
++++ b/arch/mips/defconfig-stretch
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-tb0226
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-tb0226
-+++ linux-2.4.35.4/arch/mips/defconfig-tb0226
+--- a/arch/mips/defconfig-tb0226
++++ b/arch/mips/defconfig-tb0226
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_VR41XX_KIU is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-tb0229
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-tb0229
-+++ linux-2.4.35.4/arch/mips/defconfig-tb0229
+--- a/arch/mips/defconfig-tb0229
++++ b/arch/mips/defconfig-tb0229
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_VR41XX_KIU is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-ti1500
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-ti1500
-+++ linux-2.4.35.4/arch/mips/defconfig-ti1500
+--- a/arch/mips/defconfig-ti1500
++++ b/arch/mips/defconfig-ti1500
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-workpad
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-workpad
-+++ linux-2.4.35.4/arch/mips/defconfig-workpad
+--- a/arch/mips/defconfig-workpad
++++ b/arch/mips/defconfig-workpad
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_VR41XX_KIU is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-xxs1500
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-xxs1500
-+++ linux-2.4.35.4/arch/mips/defconfig-xxs1500
+--- a/arch/mips/defconfig-xxs1500
++++ b/arch/mips/defconfig-xxs1500
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/defconfig-yosemite
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig-yosemite
-+++ linux-2.4.35.4/arch/mips/defconfig-yosemite
+--- a/arch/mips/defconfig-yosemite
++++ b/arch/mips/defconfig-yosemite
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips/kernel/cpu-probe.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/cpu-probe.c
-+++ linux-2.4.35.4/arch/mips/kernel/cpu-probe.c
+--- a/arch/mips/kernel/cpu-probe.c
++++ b/arch/mips/kernel/cpu-probe.c
@@ -34,21 +34,16 @@ static void r4k_wait(void)
".set\tmips0");
}
default:
printk(" unavailable.\n");
break;
-Index: linux-2.4.35.4/arch/mips/kernel/head.S
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/head.S
-+++ linux-2.4.35.4/arch/mips/kernel/head.S
+--- a/arch/mips/kernel/head.S
++++ b/arch/mips/kernel/head.S
@@ -43,9 +43,9 @@
/* Cache Error */
END(smp_bootstrap)
#endif
-Index: linux-2.4.35.4/arch/mips/kernel/process.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/process.c
-+++ linux-2.4.35.4/arch/mips/kernel/process.c
+--- a/arch/mips/kernel/process.c
++++ b/arch/mips/kernel/process.c
@@ -128,6 +128,26 @@ int dump_fpu(struct pt_regs *regs, elf_f
return 1;
}
/*
* Create a kernel thread
*/
-Index: linux-2.4.35.4/arch/mips/kernel/scall_o32.S
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/scall_o32.S
-+++ linux-2.4.35.4/arch/mips/kernel/scall_o32.S
+--- a/arch/mips/kernel/scall_o32.S
++++ b/arch/mips/kernel/scall_o32.S
@@ -121,15 +121,14 @@ reschedule:
trace_a_syscall:
li t0, -EMAXERRNO - 1 # error?
sltu t0, t0, v0
-Index: linux-2.4.35.4/arch/mips/kernel/setup.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/setup.c
-+++ linux-2.4.35.4/arch/mips/kernel/setup.c
+--- a/arch/mips/kernel/setup.c
++++ b/arch/mips/kernel/setup.c
@@ -5,7 +5,7 @@
*
* Copyright (C) 1995 Linus Torvalds
start_kernel();
}
-Index: linux-2.4.35.4/arch/mips/kernel/traps.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/traps.c
-+++ linux-2.4.35.4/arch/mips/kernel/traps.c
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
@@ -452,9 +452,10 @@ static inline void simulate_ll(struct pt
}
ll_task = current;
- TLBMISS_HANDLER_SETUP();
+ per_cpu_trap_init();
}
-Index: linux-2.4.35.4/arch/mips/lib/rtc-no.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/lib/rtc-no.c
-+++ linux-2.4.35.4/arch/mips/lib/rtc-no.c
+--- a/arch/mips/lib/rtc-no.c
++++ b/arch/mips/lib/rtc-no.c
@@ -6,10 +6,9 @@
* Stub RTC routines to keep Linux from crashing on machine which don't
* have a RTC chip.
};
-
-EXPORT_SYMBOL(rtc_ops);
-Index: linux-2.4.35.4/arch/mips/lib/rtc-std.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/lib/rtc-std.c
-+++ linux-2.4.35.4/arch/mips/lib/rtc-std.c
+--- a/arch/mips/lib/rtc-std.c
++++ b/arch/mips/lib/rtc-std.c
@@ -5,9 +5,8 @@
*
* RTC routines for PC style attached Dallas chip.
};
-
-EXPORT_SYMBOL(rtc_ops);
-Index: linux-2.4.35.4/arch/mips/Makefile
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/Makefile
-+++ linux-2.4.35.4/arch/mips/Makefile
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
@@ -209,7 +209,7 @@ LOADADDR := 0x80080000
endif
#
# Cogent CSB250
-Index: linux-2.4.35.4/arch/mips/mm/cerr-sb1.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/mm/cerr-sb1.c
-+++ linux-2.4.35.4/arch/mips/mm/cerr-sb1.c
+--- a/arch/mips/mm/cerr-sb1.c
++++ b/arch/mips/mm/cerr-sb1.c
@@ -252,14 +252,14 @@ static const uint8_t parity[256] = {
/* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */
if (way == 0) {
lru = (taghi >> 14) & 0xff;
prom_printf("[Bank %d Set 0x%02x] LRU > %d %d %d %d > MRU\n",
-Index: linux-2.4.35.4/arch/mips/mm/c-r4k.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/mm/c-r4k.c
-+++ linux-2.4.35.4/arch/mips/mm/c-r4k.c
+--- a/arch/mips/mm/c-r4k.c
++++ b/arch/mips/mm/c-r4k.c
@@ -867,9 +867,16 @@ static void __init probe_pcache(void)
* normally they'd suffer from aliases but magic in the hardware deals
* with that for us so we don't need to take care ourselves.
r4k_blast_dcache_page_setup();
r4k_blast_dcache_page_indexed_setup();
r4k_blast_dcache_setup();
-Index: linux-2.4.35.4/arch/mips/mm/tlbex-mips32.S
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/mm/tlbex-mips32.S
-+++ linux-2.4.35.4/arch/mips/mm/tlbex-mips32.S
+--- a/arch/mips/mm/tlbex-mips32.S
++++ b/arch/mips/mm/tlbex-mips32.S
@@ -196,7 +196,7 @@
.set noat; \
SAVE_ALL; \
.set at; \
move a0, sp; \
jal do_page_fault; \
-Index: linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/mm/tlbex-r4k.S
-+++ linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S
+--- a/arch/mips/mm/tlbex-r4k.S
++++ b/arch/mips/mm/tlbex-r4k.S
@@ -184,13 +184,10 @@
P_MTC0 k0, CP0_ENTRYLO0 # load it
PTE_SRL k1, k1, 6 # convert to entrylo1
.set mips3
eret
.set mips0
-Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/mm/tlb-r4k.c
-+++ linux-2.4.35.4/arch/mips/mm/tlb-r4k.c
+--- a/arch/mips/mm/tlb-r4k.c
++++ b/arch/mips/mm/tlb-r4k.c
@@ -3,17 +3,12 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
/*
* You should never change this register:
-Index: linux-2.4.35.4/arch/mips64/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/defconfig
-+++ linux-2.4.35.4/arch/mips64/defconfig
+--- a/arch/mips64/defconfig
++++ b/arch/mips64/defconfig
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips64/defconfig-atlas
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/defconfig-atlas
-+++ linux-2.4.35.4/arch/mips64/defconfig-atlas
+--- a/arch/mips64/defconfig-atlas
++++ b/arch/mips64/defconfig-atlas
@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips64/defconfig-decstation
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/defconfig-decstation
-+++ linux-2.4.35.4/arch/mips64/defconfig-decstation
+--- a/arch/mips64/defconfig-decstation
++++ b/arch/mips64/defconfig-decstation
@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips64/defconfig-ip22
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/defconfig-ip22
-+++ linux-2.4.35.4/arch/mips64/defconfig-ip22
+--- a/arch/mips64/defconfig-ip22
++++ b/arch/mips64/defconfig-ip22
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips64/defconfig-ip27
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/defconfig-ip27
-+++ linux-2.4.35.4/arch/mips64/defconfig-ip27
+--- a/arch/mips64/defconfig-ip27
++++ b/arch/mips64/defconfig-ip27
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips64/defconfig-jaguar
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/defconfig-jaguar
-+++ linux-2.4.35.4/arch/mips64/defconfig-jaguar
+--- a/arch/mips64/defconfig-jaguar
++++ b/arch/mips64/defconfig-jaguar
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips64/defconfig-malta
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/defconfig-malta
-+++ linux-2.4.35.4/arch/mips64/defconfig-malta
+--- a/arch/mips64/defconfig-malta
++++ b/arch/mips64/defconfig-malta
@@ -22,16 +22,19 @@ CONFIG_KMOD=y
#
# CONFIG_ACER_PICA_61 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips64/defconfig-ocelotc
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/defconfig-ocelotc
-+++ linux-2.4.35.4/arch/mips64/defconfig-ocelotc
+--- a/arch/mips64/defconfig-ocelotc
++++ b/arch/mips64/defconfig-ocelotc
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/defconfig-sb1250-swarm
-+++ linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm
+--- a/arch/mips64/defconfig-sb1250-swarm
++++ b/arch/mips64/defconfig-sb1250-swarm
@@ -30,8 +30,8 @@ CONFIG_KMOD=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
-Index: linux-2.4.35.4/arch/mips64/defconfig-sead
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/defconfig-sead
-+++ linux-2.4.35.4/arch/mips64/defconfig-sead
+--- a/arch/mips64/defconfig-sead
++++ b/arch/mips64/defconfig-sead
@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_MIPS_PB1000 is not set
# CONFIG_MIPS_PB1100 is not set
# CONFIG_UNIX98_PTYS is not set
#
-Index: linux-2.4.35.4/arch/mips64/kernel/binfmt_elfn32.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/kernel/binfmt_elfn32.c
-+++ linux-2.4.35.4/arch/mips64/kernel/binfmt_elfn32.c
+--- a/arch/mips64/kernel/binfmt_elfn32.c
++++ b/arch/mips64/kernel/binfmt_elfn32.c
@@ -116,4 +116,7 @@ MODULE_AUTHOR("Ralf Baechle (ralf@linux-
#undef MODULE_DESCRIPTION
#undef MODULE_AUTHOR
+#define TASK_SIZE TASK_SIZE32
+
#include "../../../fs/binfmt_elf.c"
-Index: linux-2.4.35.4/arch/mips64/kernel/binfmt_elfo32.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/kernel/binfmt_elfo32.c
-+++ linux-2.4.35.4/arch/mips64/kernel/binfmt_elfo32.c
+--- a/arch/mips64/kernel/binfmt_elfo32.c
++++ b/arch/mips64/kernel/binfmt_elfo32.c
@@ -137,4 +137,7 @@ MODULE_AUTHOR("Ralf Baechle (ralf@linux-
#undef MODULE_DESCRIPTION
#undef MODULE_AUTHOR
+#define TASK_SIZE TASK_SIZE32
+
#include "../../../fs/binfmt_elf.c"
-Index: linux-2.4.35.4/arch/mips64/kernel/head.S
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/kernel/head.S
-+++ linux-2.4.35.4/arch/mips64/kernel/head.S
+--- a/arch/mips64/kernel/head.S
++++ b/arch/mips64/kernel/head.S
@@ -91,6 +91,21 @@ EXPORT(_stext)
__INIT
END(smp_bootstrap)
#endif /* CONFIG_SMP */
-Index: linux-2.4.35.4/arch/mips64/kernel/ioctl32.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/kernel/ioctl32.c
-+++ linux-2.4.35.4/arch/mips64/kernel/ioctl32.c
+--- a/arch/mips64/kernel/ioctl32.c
++++ b/arch/mips64/kernel/ioctl32.c
@@ -2352,7 +2352,7 @@ static struct ioctl32_list ioctl32_handl
IOCTL32_HANDLER(AUTOFS_IOC_SETTIMEOUT32, ioc_settimeout),
IOCTL32_DEFAULT(AUTOFS_IOC_EXPIRE),
IOCTL32_DEFAULT(AUTOFS_IOC_ASKREGHOST),
IOCTL32_DEFAULT(AUTOFS_IOC_TOGGLEREGHOST),
IOCTL32_DEFAULT(AUTOFS_IOC_ASKUMOUNT),
-Index: linux-2.4.35.4/arch/mips64/kernel/linux32.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/kernel/linux32.c
-+++ linux-2.4.35.4/arch/mips64/kernel/linux32.c
+--- a/arch/mips64/kernel/linux32.c
++++ b/arch/mips64/kernel/linux32.c
@@ -1101,6 +1101,7 @@ do_readv_writev32(int type, struct file
* specially as they have atomicity guarantees and can handle
* iovec's natively
/*
* Ooo, nasty. We need here to frob 32-bit unsigned longs to
* 64-bit unsigned longs.
-Index: linux-2.4.35.4/arch/mips64/kernel/process.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/kernel/process.c
-+++ linux-2.4.35.4/arch/mips64/kernel/process.c
+--- a/arch/mips64/kernel/process.c
++++ b/arch/mips64/kernel/process.c
@@ -125,6 +125,25 @@ int dump_fpu(struct pt_regs *regs, elf_f
return 1;
}
/*
* Create a kernel thread
*/
-Index: linux-2.4.35.4/arch/mips64/kernel/scall_64.S
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/kernel/scall_64.S
-+++ linux-2.4.35.4/arch/mips64/kernel/scall_64.S
+--- a/arch/mips64/kernel/scall_64.S
++++ b/arch/mips64/kernel/scall_64.S
@@ -102,15 +102,14 @@ _64_reschedule:
trace_a_syscall:
li t0, -EMAXERRNO - 1 # error?
sltu t0, t0, v0
-Index: linux-2.4.35.4/arch/mips64/kernel/scall_n32.S
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/kernel/scall_n32.S
-+++ linux-2.4.35.4/arch/mips64/kernel/scall_n32.S
+--- a/arch/mips64/kernel/scall_n32.S
++++ b/arch/mips64/kernel/scall_n32.S
@@ -106,15 +106,14 @@ n32_reschedule:
trace_a_syscall:
li t0, -EMAXERRNO - 1 # error?
sltu t0, t0, v0
-Index: linux-2.4.35.4/arch/mips64/kernel/scall_o32.S
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/kernel/scall_o32.S
-+++ linux-2.4.35.4/arch/mips64/kernel/scall_o32.S
+--- a/arch/mips64/kernel/scall_o32.S
++++ b/arch/mips64/kernel/scall_o32.S
@@ -118,9 +118,8 @@ trace_a_syscall:
sd a6, PT_R10(sp)
sd a7, PT_R11(sp)
.macro sys function, nargs
.byte \nargs
.endm
-Index: linux-2.4.35.4/arch/mips64/kernel/setup.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/kernel/setup.c
-+++ linux-2.4.35.4/arch/mips64/kernel/setup.c
+--- a/arch/mips64/kernel/setup.c
++++ b/arch/mips64/kernel/setup.c
@@ -129,14 +129,6 @@ asmlinkage void __init init_arch(int arg
*/
load_mmu();
start_kernel();
}
-Index: linux-2.4.35.4/arch/mips64/kernel/signal_n32.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/kernel/signal_n32.c
-+++ linux-2.4.35.4/arch/mips64/kernel/signal_n32.c
+--- a/arch/mips64/kernel/signal_n32.c
++++ b/arch/mips64/kernel/signal_n32.c
@@ -68,7 +68,7 @@ struct rt_sigframe_n32 {
};
asmlinkage void sysn32_rt_sigreturn(abi64_no_regargs, struct pt_regs regs)
{
-Index: linux-2.4.35.4/arch/mips64/kernel/traps.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/kernel/traps.c
-+++ linux-2.4.35.4/arch/mips64/kernel/traps.c
+--- a/arch/mips64/kernel/traps.c
++++ b/arch/mips64/kernel/traps.c
@@ -462,9 +462,10 @@ static inline void simulate_ll(struct pt
}
ll_task = current;
- current->active_mm = &init_mm;
+ per_cpu_trap_init();
}
-Index: linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/mm/cerr-sb1.c
-+++ linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c
+--- a/arch/mips64/mm/cerr-sb1.c
++++ b/arch/mips64/mm/cerr-sb1.c
@@ -252,14 +252,14 @@ static const uint8_t parity[256] = {
/* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */
if (way == 0) {
lru = (taghi >> 14) & 0xff;
prom_printf("[Bank %d Set 0x%02x] LRU > %d %d %d %d > MRU\n",
-Index: linux-2.4.35.4/arch/mips64/mm/c-r4k.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/mm/c-r4k.c
-+++ linux-2.4.35.4/arch/mips64/mm/c-r4k.c
+--- a/arch/mips64/mm/c-r4k.c
++++ b/arch/mips64/mm/c-r4k.c
@@ -867,9 +867,16 @@ static void __init probe_pcache(void)
* normally they'd suffer from aliases but magic in the hardware deals
* with that for us so we don't need to take care ourselves.
r4k_blast_dcache_page_setup();
r4k_blast_dcache_page_indexed_setup();
r4k_blast_dcache_setup();
-Index: linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/mm/tlbex-r4k.S
-+++ linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S
+--- a/arch/mips64/mm/tlbex-r4k.S
++++ b/arch/mips64/mm/tlbex-r4k.S
@@ -125,6 +125,33 @@ LEAF(except_vec1_r4k)
nop
END(except_vec1_r4k)
eret
END(handle_vec1_r10k)
-Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/mm/tlb-r4k.c
-+++ linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c
+--- a/arch/mips64/mm/tlb-r4k.c
++++ b/arch/mips64/mm/tlb-r4k.c
@@ -1,24 +1,12 @@
/*
- * Carsten Langgaard, carstenl@mips.com
probe_tlb(config);
write_c0_pagemask(PM_DEFAULT_MASK);
write_c0_wired(0);
-Index: linux-2.4.35.4/drivers/char/au1000_gpio.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/char/au1000_gpio.c
-+++ linux-2.4.35.4/drivers/char/au1000_gpio.c
+--- a/drivers/char/au1000_gpio.c
++++ b/drivers/char/au1000_gpio.c
@@ -246,7 +246,7 @@ static struct file_operations au1000gpio
static struct miscdevice au1000gpio_miscdev =
"au1000_gpio",
&au1000gpio_fops
};
-Index: linux-2.4.35.4/drivers/char/au1550_psc_spi.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/char/au1550_psc_spi.c
++++ b/drivers/char/au1550_psc_spi.c
@@ -0,0 +1,466 @@
+/*
+ * Driver for Alchemy Au1550 SPI on the PSC.
+
+module_init(au1550spi_init);
+module_exit(au1550spi_exit);
-Index: linux-2.4.35.4/drivers/char/Config.in
-===================================================================
---- linux-2.4.35.4.orig/drivers/char/Config.in
-+++ linux-2.4.35.4/drivers/char/Config.in
+--- a/drivers/char/Config.in
++++ b/drivers/char/Config.in
@@ -314,14 +314,11 @@ fi
if [ "$CONFIG_OBSOLETE" = "y" -a "$CONFIG_ALPHA_BOOK1" = "y" ]; then
bool 'Tadpole ANA H8 Support (OBSOLETE)' CONFIG_H8
fi
if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then
tristate ' ITE GPIO' CONFIG_ITE_GPIO
-Index: linux-2.4.35.4/drivers/char/decserial.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/char/decserial.c
-+++ linux-2.4.35.4/drivers/char/decserial.c
+--- a/drivers/char/decserial.c
++++ b/drivers/char/decserial.c
@@ -3,95 +3,105 @@
* choose the right serial device at boot time
*
#endif
}
-Index: linux-2.4.35.4/drivers/char/ds1286.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/char/ds1286.c
-+++ linux-2.4.35.4/drivers/char/ds1286.c
+--- a/drivers/char/ds1286.c
++++ b/drivers/char/ds1286.c
@@ -1,6 +1,10 @@
/*
* DS1286 Real Time Clock interface for Linux
+
+MODULE_AUTHOR("Ralf Baechle");
+MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/drivers/char/ds1742.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/char/ds1742.c
-+++ linux-2.4.35.4/drivers/char/ds1742.c
+--- a/drivers/char/ds1742.c
++++ b/drivers/char/ds1742.c
@@ -142,6 +142,7 @@ static int rtc_ds1742_set_time(unsigned
CMOS_WRITE(RTC_WRITE, RTC_CONTROL);
to_tm(curr_time, &rtc_tm);
rtc_tm.tm_year -= 1900;
return copy_to_user((void *) arg, &rtc_tm, sizeof(rtc_tm)) ?
-Index: linux-2.4.35.4/drivers/char/dummy_keyb.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/char/dummy_keyb.c
-+++ linux-2.4.35.4/drivers/char/dummy_keyb.c
+--- a/drivers/char/dummy_keyb.c
++++ b/drivers/char/dummy_keyb.c
@@ -141,3 +141,7 @@ void __init kbd_init_hw(void)
{
printk("Dummy keyboard driver installed.\n");
+unsigned char kbd_sysrq_key;
+unsigned char kbd_sysrq_xlate[128];
+#endif
-Index: linux-2.4.35.4/drivers/char/dz.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/char/dz.c
-+++ linux-2.4.35.4/drivers/char/dz.c
+--- a/drivers/char/dz.c
++++ b/drivers/char/dz.c
@@ -1,11 +1,13 @@
/*
- * dz.c: Serial port driver for DECStations equiped
};
void __init dz_serial_console_init(void)
-Index: linux-2.4.35.4/drivers/char/dz.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/char/dz.h
-+++ linux-2.4.35.4/drivers/char/dz.h
+--- a/drivers/char/dz.h
++++ b/drivers/char/dz.h
@@ -10,6 +10,8 @@
#ifndef DZ_SERIAL_H
#define DZ_SERIAL_H
-#endif
-
#endif /* DZ_SERIAL_H */
-Index: linux-2.4.35.4/drivers/char/ibm_workpad_keymap.map
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/char/ibm_workpad_keymap.map
++++ b/drivers/char/ibm_workpad_keymap.map
@@ -0,0 +1,343 @@
+# Keymap for IBM Workpad z50
+# US Mapping
+keycode 93 = AltGr
+keycode 94 = ShiftR
+ shift keycode 94 = Caps_Lock
-Index: linux-2.4.35.4/drivers/char/indydog.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/char/indydog.c
-+++ linux-2.4.35.4/drivers/char/indydog.c
+--- a/drivers/char/indydog.c
++++ b/drivers/char/indydog.c
@@ -1,5 +1,5 @@
/*
- * IndyDog 0.2 A Hardware Watchdog Device for SGI IP22
+MODULE_AUTHOR("Guido Guenther <agx@sigxcpu.org>");
+MODULE_DESCRIPTION("Hardware Watchdog Device for SGI IP22");
MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/drivers/char/ip27-rtc.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/char/ip27-rtc.c
-+++ linux-2.4.35.4/drivers/char/ip27-rtc.c
+--- a/drivers/char/ip27-rtc.c
++++ b/drivers/char/ip27-rtc.c
@@ -44,6 +44,7 @@
#include <asm/sn/klconfig.h>
#include <asm/sn/sn0/ip27.h>
+MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
+MODULE_DESCRIPTION("SGI IP27 M48T35 RTC driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/drivers/char/Makefile
-===================================================================
---- linux-2.4.35.4.orig/drivers/char/Makefile
-+++ linux-2.4.35.4/drivers/char/Makefile
+--- a/drivers/char/Makefile
++++ b/drivers/char/Makefile
@@ -48,7 +48,12 @@ ifeq ($(ARCH),mips)
KEYBD =
endif
+
+victor_mpc30x_keymap.c: victor_mpc30x_keymap.map
+ set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
-Index: linux-2.4.35.4/drivers/char/mips_rtc.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/char/mips_rtc.c
-+++ linux-2.4.35.4/drivers/char/mips_rtc.c
+--- a/drivers/char/mips_rtc.c
++++ b/drivers/char/mips_rtc.c
@@ -53,14 +53,6 @@
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/time.h>
static unsigned long rtc_status = 0; /* bitmapped status byte. */
-Index: linux-2.4.35.4/drivers/char/sb1250_duart.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/char/sb1250_duart.c
-+++ linux-2.4.35.4/drivers/char/sb1250_duart.c
+--- a/drivers/char/sb1250_duart.c
++++ b/drivers/char/sb1250_duart.c
@@ -328,10 +328,11 @@ static int duart_write(struct tty_struct
if (c <= 0) break;
break;
case TIOCSSERIAL:
printk("Ignoring TIOCSSERIAL\n");
-Index: linux-2.4.35.4/drivers/char/serial.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/char/serial.c
-+++ linux-2.4.35.4/drivers/char/serial.c
+--- a/drivers/char/serial.c
++++ b/drivers/char/serial.c
@@ -62,6 +62,12 @@
* Robert Schwebel <robert@schwebel.de>,
* Juergen Beisert <jbeisert@eurodsn.de>,
/*
* We used to support using pause I/O for certain machines. We
-Index: linux-2.4.35.4/drivers/char/victor_mpc30x_keymap.map
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/char/victor_mpc30x_keymap.map
++++ b/drivers/char/victor_mpc30x_keymap.map
@@ -0,0 +1,102 @@
+# Victor Interlink MP-C303/304 keyboard keymap
+#
+ alt keycode 31 = PageDown
+keycode 47 = Right
+ alt keycode 47 = End
-Index: linux-2.4.35.4/drivers/char/vr41xx_keyb.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/char/vr41xx_keyb.c
-+++ linux-2.4.35.4/drivers/char/vr41xx_keyb.c
+--- a/drivers/char/vr41xx_keyb.c
++++ b/drivers/char/vr41xx_keyb.c
@@ -308,7 +308,7 @@ void __devinit kbd_init_hw(void)
if (found != 0) {
kiu_base = VRC4173_KIU_OFFSET;
kiu_writew(KIURST_KIURST, KIURST);
-Index: linux-2.4.35.4/drivers/i2c/Config.in
-===================================================================
---- linux-2.4.35.4.orig/drivers/i2c/Config.in
-+++ linux-2.4.35.4/drivers/i2c/Config.in
+--- a/drivers/i2c/Config.in
++++ b/drivers/i2c/Config.in
@@ -57,6 +57,10 @@ if [ "$CONFIG_I2C" != "n" ]; then
if [ "$CONFIG_SGI_IP22" = "y" ]; then
dep_tristate 'I2C SGI interfaces' CONFIG_I2C_ALGO_SGI $CONFIG_I2C
# This is needed for automatic patch generation: sensors code starts here
# This is needed for automatic patch generation: sensors code ends here
-Index: linux-2.4.35.4/drivers/i2c/i2c-algo-au1550.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/i2c/i2c-algo-au1550.c
++++ b/drivers/i2c/i2c-algo-au1550.c
@@ -0,0 +1,340 @@
+/*
+ * i2c-algo-au1550.c: SMBus (i2c) driver algorithms for Alchemy PSC interface
+MODULE_AUTHOR("Dan Malek <dan@embeddededge.com>");
+MODULE_DESCRIPTION("SMBus Au1550 algorithm");
+MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/drivers/i2c/i2c-au1550.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/i2c/i2c-au1550.c
++++ b/drivers/i2c/i2c-au1550.c
@@ -0,0 +1,154 @@
+/*
+ * i2c-au1550.c: SMBus (i2c) adapter for Alchemy PSC interface
+{
+ i2c_au1550_del_bus(&pb1550_board_adapter);
+}
-Index: linux-2.4.35.4/drivers/i2c/i2c-core.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/i2c/i2c-core.c
-+++ linux-2.4.35.4/drivers/i2c/i2c-core.c
+--- a/drivers/i2c/i2c-core.c
++++ b/drivers/i2c/i2c-core.c
@@ -1277,6 +1277,9 @@ static int __init i2c_init(void)
#ifdef CONFIG_I2C_MAX1617
extern int i2c_max1617_init(void);
/* -------------- proc interface ---- */
#ifdef CONFIG_I2C_PROC
sensors_init();
-Index: linux-2.4.35.4/drivers/i2c/Makefile
-===================================================================
---- linux-2.4.35.4.orig/drivers/i2c/Makefile
-+++ linux-2.4.35.4/drivers/i2c/Makefile
+--- a/drivers/i2c/Makefile
++++ b/drivers/i2c/Makefile
@@ -6,7 +6,7 @@ O_TARGET := i2c.o
export-objs := i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o \
# This is needed for automatic patch generation: sensors code starts here
# This is needed for automatic patch generation: sensors code ends here
-Index: linux-2.4.35.4/drivers/media/video/indycam.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/media/video/indycam.c
-+++ linux-2.4.35.4/drivers/media/video/indycam.c
+--- a/drivers/media/video/indycam.c
++++ b/drivers/media/video/indycam.c
@@ -50,13 +50,14 @@ static int indycam_attach(struct i2c_ada
0x80, /* INDYCAM_GAMMA */
};
MOD_INC_USE_COUNT;
return 0;
-Index: linux-2.4.35.4/drivers/media/video/vino.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/media/video/vino.c
-+++ linux-2.4.35.4/drivers/media/video/vino.c
+--- a/drivers/media/video/vino.c
++++ b/drivers/media/video/vino.c
@@ -5,6 +5,8 @@
* License version 2 as published by the Free Software Foundation.
*
}
static int vino_grab(struct vino_device *v, int frame)
-Index: linux-2.4.35.4/drivers/mtd/devices/docprobe.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/devices/docprobe.c
-+++ linux-2.4.35.4/drivers/mtd/devices/docprobe.c
+--- a/drivers/mtd/devices/docprobe.c
++++ b/drivers/mtd/devices/docprobe.c
@@ -89,10 +89,10 @@ static unsigned long __initdata doc_loca
0xe4000000,
#elif defined(CONFIG_MOMENCO_OCELOT)
#warning Unknown architecture for DiskOnChip. No default probe locations defined
#endif
0 };
-Index: linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/devices/ms02-nv.c
-+++ linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c
+--- a/drivers/mtd/devices/ms02-nv.c
++++ b/drivers/mtd/devices/ms02-nv.c
@@ -1,10 +1,10 @@
/*
- * Copyright (c) 2001 Maciej W. Rozycki
csr = (volatile u32 *)KN03_MCR_BASE;
if (*csr & KN03_MCR_BNK32M)
stride = 2;
-Index: linux-2.4.35.4/drivers/mtd/devices/ms02-nv.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/devices/ms02-nv.h
-+++ linux-2.4.35.4/drivers/mtd/devices/ms02-nv.h
+--- a/drivers/mtd/devices/ms02-nv.h
++++ b/drivers/mtd/devices/ms02-nv.h
@@ -1,32 +1,96 @@
/*
- * Copyright (c) 2001 Maciej W. Rozycki
typedef volatile u32 ms02nv_uint;
struct ms02nv_private {
-Index: linux-2.4.35.4/drivers/mtd/maps/Config.in
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/maps/Config.in
-+++ linux-2.4.35.4/drivers/mtd/maps/Config.in
+--- a/drivers/mtd/maps/Config.in
++++ b/drivers/mtd/maps/Config.in
@@ -51,11 +51,26 @@ if [ "$CONFIG_MIPS" = "y" ]; then
dep_tristate ' Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
dep_tristate ' Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
dep_tristate ' Flash chip mapping on ITE QED-4N-S01B, Globespan IVR or custom board' CONFIG_MTD_CSTM_MIPS_IXX $CONFIG_MTD_CFI $CONFIG_MTD_JEDEC $CONFIG_MTD_PARTITIONS
if [ "$CONFIG_MTD_CSTM_MIPS_IXX" = "y" -o "$CONFIG_MTD_CSTM_MIPS_IXX" = "m" ]; then
hex ' Physical start address of flash mapping' CONFIG_MTD_CSTM_MIPS_IXX_START 0x8000000
-Index: linux-2.4.35.4/drivers/mtd/maps/db1x00-flash.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/mtd/maps/db1x00-flash.c
++++ b/drivers/mtd/maps/db1x00-flash.c
@@ -0,0 +1,283 @@
+/*
+ * Flash memory access on Alchemy Db1xxx boards
+MODULE_AUTHOR("Pete Popov");
+MODULE_DESCRIPTION("Db1x00 mtd map driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/drivers/mtd/maps/hydrogen3-flash.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/mtd/maps/hydrogen3-flash.c
++++ b/drivers/mtd/maps/hydrogen3-flash.c
@@ -0,0 +1,189 @@
+/*
+ * Flash memory access on Alchemy HydrogenIII boards
+MODULE_AUTHOR("Pete Popov");
+MODULE_DESCRIPTION("HydrogenIII mtd map driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/drivers/mtd/maps/lasat.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/maps/lasat.c
-+++ linux-2.4.35.4/drivers/mtd/maps/lasat.c
+--- a/drivers/mtd/maps/lasat.c
++++ b/drivers/mtd/maps/lasat.c
@@ -1,15 +1,6 @@
/*
* Flash device on lasat 100 and 200 boards
}
}
-Index: linux-2.4.35.4/drivers/mtd/maps/Makefile
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/maps/Makefile
-+++ linux-2.4.35.4/drivers/mtd/maps/Makefile
+--- a/drivers/mtd/maps/Makefile
++++ b/drivers/mtd/maps/Makefile
@@ -52,7 +52,13 @@ obj-$(CONFIG_MTD_PCI) += pci.o
obj-$(CONFIG_MTD_PB1000) += pb1xxx-flash.o
obj-$(CONFIG_MTD_PB1100) += pb1xxx-flash.o
+obj-$(CONFIG_MTD_MIRAGE) += mirage-flash.o
include $(TOPDIR)/Rules.make
-Index: linux-2.4.35.4/drivers/mtd/maps/mirage-flash.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/mtd/maps/mirage-flash.c
++++ b/drivers/mtd/maps/mirage-flash.c
@@ -0,0 +1,194 @@
+/*
+ * Flash memory access on AMD Mirage board.
+MODULE_AUTHOR("Embedded Edge");
+MODULE_DESCRIPTION("Mirage mtd map driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/drivers/mtd/maps/mtx-1.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/mtd/maps/mtx-1.c
++++ b/drivers/mtd/maps/mtx-1.c
@@ -0,0 +1,181 @@
+/*
+ * Flash memory access on 4G Systems MTX-1 board
+MODULE_AUTHOR("Pete Popov");
+MODULE_DESCRIPTION("MTX-1 CFI map driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/drivers/mtd/maps/pb1550-flash.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/mtd/maps/pb1550-flash.c
++++ b/drivers/mtd/maps/pb1550-flash.c
@@ -0,0 +1,270 @@
+/*
+ * Flash memory access on Alchemy Pb1550 board
+MODULE_AUTHOR("Embedded Edge, LLC");
+MODULE_DESCRIPTION("Pb1550 mtd map driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/drivers/mtd/maps/pb1xxx-flash.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/maps/pb1xxx-flash.c
-+++ linux-2.4.35.4/drivers/mtd/maps/pb1xxx-flash.c
+--- a/drivers/mtd/maps/pb1xxx-flash.c
++++ b/drivers/mtd/maps/pb1xxx-flash.c
@@ -192,6 +192,34 @@ static struct mtd_partition pb1xxx_parti
#else
#error MTD_PB1500 define combo error /* should never happen */
#else
#error Unsupported board
#endif
-Index: linux-2.4.35.4/drivers/mtd/maps/xxs1500.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/mtd/maps/xxs1500.c
++++ b/drivers/mtd/maps/xxs1500.c
@@ -0,0 +1,186 @@
+/*
+ * Flash memory access on MyCable XXS1500 board
+MODULE_AUTHOR("Pete Popov");
+MODULE_DESCRIPTION("XXS1500 CFI map driver");
+MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/drivers/net/defxx.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/defxx.c
-+++ linux-2.4.35.4/drivers/net/defxx.c
+--- a/drivers/net/defxx.c
++++ b/drivers/net/defxx.c
@@ -10,24 +10,18 @@
*
* Abstract:
MODULE_LICENSE("GPL");
\f
-Index: linux-2.4.35.4/drivers/net/defxx.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/defxx.h
-+++ linux-2.4.35.4/drivers/net/defxx.h
+--- a/drivers/net/defxx.h
++++ b/drivers/net/defxx.h
@@ -12,17 +12,11 @@
* Contains all definitions specified by port specification and required
* by the defxx.c driver.
struct pci_dev * pci_dev;
u32 full_duplex_enb; /* FDDI Full Duplex enable (1 == on, 2 == off) */
u32 req_ttrt; /* requested TTRT value (in 80ns units) */
-Index: linux-2.4.35.4/drivers/net/hamradio/hdlcdrv.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/hamradio/hdlcdrv.c
-+++ linux-2.4.35.4/drivers/net/hamradio/hdlcdrv.c
+--- a/drivers/net/hamradio/hdlcdrv.c
++++ b/drivers/net/hamradio/hdlcdrv.c
@@ -587,6 +587,8 @@ static int hdlcdrv_close(struct net_devi
return -EINVAL;
s = (struct hdlcdrv_state *)dev->priv;
if (s->ops && s->ops->close)
i = s->ops->close(dev);
if (s->skb)
-Index: linux-2.4.35.4/drivers/net/irda/au1k_ir.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/irda/au1k_ir.c
-+++ linux-2.4.35.4/drivers/net/irda/au1k_ir.c
+--- a/drivers/net/irda/au1k_ir.c
++++ b/drivers/net/irda/au1k_ir.c
@@ -81,10 +81,6 @@ static char version[] __devinitdata =
#define RUN_AT(x) (jiffies + (x))
static spinlock_t ir_lock = SPIN_LOCK_UNLOCKED;
/*
-Index: linux-2.4.35.4/drivers/net/sgiseeq.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/sgiseeq.c
-+++ linux-2.4.35.4/drivers/net/sgiseeq.c
+--- a/drivers/net/sgiseeq.c
++++ b/drivers/net/sgiseeq.c
@@ -24,16 +24,16 @@
#include <asm/io.h>
#include <asm/system.h>
+MODULE_DESCRIPTION("SGI Seeq 8003 driver");
+MODULE_AUTHOR("David S. Miller");
MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/drivers/pci/pci.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/pci/pci.c
-+++ linux-2.4.35.4/drivers/pci/pci.c
+--- a/drivers/pci/pci.c
++++ b/drivers/pci/pci.c
@@ -1281,11 +1281,17 @@ static int __devinit pci_scan_bridge(str
{
unsigned int buses;
sprintf(child->name, (is_cardbus ? "PCI CardBus #%02x" : "PCI Bus #%02x"), child->number);
return max;
}
-Index: linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/pcmcia/au1000_db1x00.c
-+++ linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c
+--- a/drivers/pcmcia/au1000_db1x00.c
++++ b/drivers/pcmcia/au1000_db1x00.c
@@ -1,6 +1,6 @@
/*
*
return 0;
}
-Index: linux-2.4.35.4/drivers/pcmcia/Config.in
-===================================================================
---- linux-2.4.35.4.orig/drivers/pcmcia/Config.in
-+++ linux-2.4.35.4/drivers/pcmcia/Config.in
+--- a/drivers/pcmcia/Config.in
++++ b/drivers/pcmcia/Config.in
@@ -30,16 +30,14 @@ if [ "$CONFIG_PCMCIA" != "n" ]; then
dep_tristate ' M8xx support' CONFIG_PCMCIA_M8XX $CONFIG_PCMCIA
fi
if [ "$CONFIG_VRC4173" = "y" -o "$CONFIG_VRC4173" = "m" ]; then
dep_tristate ' NEC VRC4173 CARDU support' CONFIG_PCMCIA_VRC4173 $CONFIG_PCMCIA
fi
-Index: linux-2.4.35.4/drivers/pcmcia/Makefile
-===================================================================
---- linux-2.4.35.4.orig/drivers/pcmcia/Makefile
-+++ linux-2.4.35.4/drivers/pcmcia/Makefile
+--- a/drivers/pcmcia/Makefile
++++ b/drivers/pcmcia/Makefile
@@ -61,9 +61,18 @@ endif
obj-$(CONFIG_PCMCIA_AU1X00) += au1x00_ss.o
obj-$(CONFIG_PCMCIA_VRC4173) += vrc4173_cardu.o
include $(TOPDIR)/Rules.make
-Index: linux-2.4.35.4/drivers/pcmcia/vrc4171_card.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/pcmcia/vrc4171_card.c
++++ b/drivers/pcmcia/vrc4171_card.c
@@ -0,0 +1,886 @@
+/*
+ * vrc4171_card.c, NEC VRC4171 Card Controller driver for Socket Services.
+
+module_init(vrc4171_card_init);
+module_exit(vrc4171_card_exit);
-Index: linux-2.4.35.4/drivers/scsi/NCR53C9x.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/scsi/NCR53C9x.h
-+++ linux-2.4.35.4/drivers/scsi/NCR53C9x.h
+--- a/drivers/scsi/NCR53C9x.h
++++ b/drivers/scsi/NCR53C9x.h
@@ -144,12 +144,7 @@
#ifndef MULTIPLE_PAD_SIZES
#define esp_read(__reg) (__reg)
struct ESP_regs {
-Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/sound/au1550_i2s.c
-+++ linux-2.4.35.4/drivers/sound/au1550_i2s.c
+--- a/drivers/sound/au1550_i2s.c
++++ b/drivers/sound/au1550_i2s.c
@@ -41,6 +41,7 @@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
err_dev1:
au1xxx_dbdma_chan_free(s->dma_adc.dmanr);
err_dma2:
-Index: linux-2.4.35.4/drivers/sound/au1550_psc.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/sound/au1550_psc.c
-+++ linux-2.4.35.4/drivers/sound/au1550_psc.c
+--- a/drivers/sound/au1550_psc.c
++++ b/drivers/sound/au1550_psc.c
@@ -30,6 +30,7 @@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
return 0;
err_dev3:
-Index: linux-2.4.35.4/drivers/sound/Config.in
-===================================================================
---- linux-2.4.35.4.orig/drivers/sound/Config.in
-+++ linux-2.4.35.4/drivers/sound/Config.in
+--- a/drivers/sound/Config.in
++++ b/drivers/sound/Config.in
@@ -72,10 +72,15 @@ fi
if [ "$CONFIG_DDB5477" = "y" ]; then
dep_tristate ' NEC Vrc5477 AC97 sound' CONFIG_SOUND_VRC5477 $CONFIG_SOUND
fi
dep_tristate ' Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core' CONFIG_SOUND_TRIDENT $CONFIG_SOUND $CONFIG_PCI
-Index: linux-2.4.35.4/drivers/tc/lk201.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/tc/lk201.c
-+++ linux-2.4.35.4/drivers/tc/lk201.c
+--- a/drivers/tc/lk201.c
++++ b/drivers/tc/lk201.c
@@ -5,7 +5,7 @@
* for more details.
*
+ if (!register_dec_serial_hook(keyb_line, &lk201_hook))
+ unregister_dec_serial_hook(keyb_line);
}
-Index: linux-2.4.35.4/drivers/tc/zs.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/tc/zs.c
-+++ linux-2.4.35.4/drivers/tc/zs.c
+--- a/drivers/tc/zs.c
++++ b/drivers/tc/zs.c
@@ -68,6 +68,8 @@
#include <asm/bitops.h>
#include <asm/uaccess.h>
}
void __init zs_kgdb_hook(int tty_num)
-Index: linux-2.4.35.4/drivers/tc/zs.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/tc/zs.h
-+++ linux-2.4.35.4/drivers/tc/zs.h
+--- a/drivers/tc/zs.h
++++ b/drivers/tc/zs.h
@@ -1,14 +1,18 @@
/*
- * macserial.h: Definitions for the Macintosh Z8530 serial driver.
unsigned char *xmit_buf;
int xmit_head;
int xmit_tail;
-Index: linux-2.4.35.4/drivers/video/au1200fb.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/video/au1200fb.c
++++ b/drivers/video/au1200fb.c
@@ -0,0 +1,1564 @@
+/*
+ * BRIEF MODULE DESCRIPTION
+#endif /* MODULE */
+
+
-Index: linux-2.4.35.4/drivers/video/au1200fb.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/video/au1200fb.h
++++ b/drivers/video/au1200fb.h
@@ -0,0 +1,288 @@
+/*
+ * BRIEF MODULE DESCRIPTION
+
+/********************************************************************/
+#endif /* _AU1200LCD_H */
-Index: linux-2.4.35.4/drivers/video/Config.in
-===================================================================
---- linux-2.4.35.4.orig/drivers/video/Config.in
-+++ linux-2.4.35.4/drivers/video/Config.in
+--- a/drivers/video/Config.in
++++ b/drivers/video/Config.in
@@ -87,8 +87,8 @@ if [ "$CONFIG_FB" = "y" ]; then
if [ "$CONFIG_HP300" = "y" ]; then
define_bool CONFIG_FB_HP300 y
fi
fi
fi
-Index: linux-2.4.35.4/drivers/video/fbmem.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/video/fbmem.c
-+++ linux-2.4.35.4/drivers/video/fbmem.c
+--- a/drivers/video/fbmem.c
++++ b/drivers/video/fbmem.c
@@ -139,6 +139,8 @@ extern int e1356fb_init(void);
extern int e1356fb_setup(char*);
extern int au1100fb_init(void);
#ifdef CONFIG_FB_IT8181
{ "it8181fb", it8181fb_init, it8181fb_setup },
#endif
-Index: linux-2.4.35.4/drivers/video/ims332.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/video/ims332.h
++++ b/drivers/video/ims332.h
@@ -0,0 +1,275 @@
+/*
+ * linux/drivers/video/ims332.h
+ IMS332_CTRL_A_BOOT_ENABLE_VTG);
+ printk("\n");
+}
-Index: linux-2.4.35.4/drivers/video/Makefile
-===================================================================
---- linux-2.4.35.4.orig/drivers/video/Makefile
-+++ linux-2.4.35.4/drivers/video/Makefile
+--- a/drivers/video/Makefile
++++ b/drivers/video/Makefile
@@ -87,6 +87,7 @@ obj-$(CONFIG_FB_PMAGB_B) += pma
obj-$(CONFIG_FB_MAXINE) += maxinefb.o
obj-$(CONFIG_FB_TX3912) += tx3912fb.o
obj-$(CONFIG_FB_IT8181) += it8181fb.o fbgen.o
subdir-$(CONFIG_STI_CONSOLE) += sti
-Index: linux-2.4.35.4/drivers/video/maxinefb.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/video/maxinefb.h
+--- a/drivers/video/maxinefb.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-#define IMS332_REG_COLOR_PALETTE 0x100 /* color palette, 256 entries */
-#define IMS332_REG_CURSOR_COLOR_PALETTE 0x0a1 /* cursor color palette, */
- /* 3 entries */
-Index: linux-2.4.35.4/drivers/video/newport_con.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/video/newport_con.c
-+++ linux-2.4.35.4/drivers/video/newport_con.c
+--- a/drivers/video/newport_con.c
++++ b/drivers/video/newport_con.c
@@ -22,6 +22,7 @@
#include <linux/module.h>
#include <linux/slab.h>
}
module_init(newport_console_init);
-Index: linux-2.4.35.4/drivers/video/tgafb.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/video/tgafb.c
-+++ linux-2.4.35.4/drivers/video/tgafb.c
+--- a/drivers/video/tgafb.c
++++ b/drivers/video/tgafb.c
@@ -45,6 +45,15 @@
#include <linux/console.h>
#include <asm/io.h>
return 0;
}
-Index: linux-2.4.35.4/drivers/video/tgafb.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/video/tgafb.h
-+++ linux-2.4.35.4/drivers/video/tgafb.h
+--- a/drivers/video/tgafb.h
++++ b/drivers/video/tgafb.h
@@ -36,6 +36,7 @@
#define TGA_RASTEROP_REG 0x0034
#define TGA_PIXELSHIFT_REG 0x0038
#define TGA_PIXELMASK_REG 0x005c
#define TGA_CURSOR_BASE_REG 0x0060
#define TGA_HORIZ_REG 0x0064
-Index: linux-2.4.35.4/fs/binfmt_elf.c
-===================================================================
---- linux-2.4.35.4.orig/fs/binfmt_elf.c
-+++ linux-2.4.35.4/fs/binfmt_elf.c
+--- a/fs/binfmt_elf.c
++++ b/fs/binfmt_elf.c
@@ -665,6 +665,9 @@ static int load_elf_binary(struct linux_
bprm->argc++;
}
elf.e_ehsize = sizeof(elf);
elf.e_phentsize = sizeof(struct elf_phdr);
elf.e_phnum = segs+1; /* Include notes */
-Index: linux-2.4.35.4/fs/partitions/sgi.c
-===================================================================
---- linux-2.4.35.4.orig/fs/partitions/sgi.c
-+++ linux-2.4.35.4/fs/partitions/sgi.c
+--- a/fs/partitions/sgi.c
++++ b/fs/partitions/sgi.c
@@ -17,6 +17,11 @@
#include "check.h"
#include "sgi.h"
current_minor++;
}
printk("\n");
-Index: linux-2.4.35.4/fs/proc/array.c
-===================================================================
---- linux-2.4.35.4.orig/fs/proc/array.c
-+++ linux-2.4.35.4/fs/proc/array.c
+--- a/fs/proc/array.c
++++ b/fs/proc/array.c
@@ -368,15 +368,15 @@ int proc_pid_stat(struct task_struct *ta
task->cmin_flt,
task->maj_flt,
return len;
}
-Index: linux-2.4.35.4/fs/proc/proc_misc.c
-===================================================================
---- linux-2.4.35.4.orig/fs/proc/proc_misc.c
-+++ linux-2.4.35.4/fs/proc/proc_misc.c
+--- a/fs/proc/proc_misc.c
++++ b/fs/proc/proc_misc.c
@@ -308,16 +308,16 @@ static int kstat_read_proc(char *page, c
{
int i, len = 0;
+ kstat.per_cpu_nice[cpu_logical_map(i)] \
+ kstat.per_cpu_system[cpu_logical_map(i)]));
proc_sprintf(page, &off, &len,
-Index: linux-2.4.35.4/include/asm-alpha/param.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-alpha/param.h
-+++ linux-2.4.35.4/include/asm-alpha/param.h
+--- a/include/asm-alpha/param.h
++++ b/include/asm-alpha/param.h
@@ -13,6 +13,9 @@
# else
# define HZ 1200
#endif
#define EXEC_PAGESIZE 8192
-Index: linux-2.4.35.4/include/asm-i386/param.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-i386/param.h
-+++ linux-2.4.35.4/include/asm-i386/param.h
+--- a/include/asm-i386/param.h
++++ b/include/asm-i386/param.h
@@ -3,6 +3,9 @@
#ifndef HZ
#endif
#define EXEC_PAGESIZE 4096
-Index: linux-2.4.35.4/include/asm-ia64/param.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-ia64/param.h
-+++ linux-2.4.35.4/include/asm-ia64/param.h
+--- a/include/asm-ia64/param.h
++++ b/include/asm-ia64/param.h
@@ -7,9 +7,15 @@
* Based on <asm-i386/param.h>.
*
#define EXEC_PAGESIZE 65536
#ifndef NGROUPS
-Index: linux-2.4.35.4/include/asm-m68k/param.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-m68k/param.h
-+++ linux-2.4.35.4/include/asm-m68k/param.h
+--- a/include/asm-m68k/param.h
++++ b/include/asm-m68k/param.h
@@ -3,6 +3,9 @@
#ifndef HZ
#endif
#define EXEC_PAGESIZE 8192
-Index: linux-2.4.35.4/include/asm-mips/au1000_gpio.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/au1000_gpio.h
-+++ linux-2.4.35.4/include/asm-mips/au1000_gpio.h
+--- a/include/asm-mips/au1000_gpio.h
++++ b/include/asm-mips/au1000_gpio.h
@@ -30,6 +30,13 @@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#endif
#endif
-Index: linux-2.4.35.4/include/asm-mips/au1000.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/au1000.h
-+++ linux-2.4.35.4/include/asm-mips/au1000.h
+--- a/include/asm-mips/au1000.h
++++ b/include/asm-mips/au1000.h
@@ -160,28 +160,356 @@ extern au1xxx_irq_map_t au1xxx_irq_map[]
#define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5)
#endif
+
+#endif
+
-Index: linux-2.4.35.4/include/asm-mips/au1000_pcmcia.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/au1000_pcmcia.h
-+++ linux-2.4.35.4/include/asm-mips/au1000_pcmcia.h
+--- a/include/asm-mips/au1000_pcmcia.h
++++ b/include/asm-mips/au1000_pcmcia.h
@@ -38,16 +38,41 @@
#define AU1X_SOCK0_PHYS_MEM 0xF80000000
#endif
struct pcmcia_state {
-Index: linux-2.4.35.4/include/asm-mips/au1100_mmc.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/au1100_mmc.h
-+++ linux-2.4.35.4/include/asm-mips/au1100_mmc.h
+--- a/include/asm-mips/au1100_mmc.h
++++ b/include/asm-mips/au1100_mmc.h
@@ -39,16 +39,22 @@
#define __ASM_AU1100_MMC_H
+
#endif /* __ASM_AU1100_MMC_H */
-Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/au1xxx_dbdma.h
-+++ linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h
+--- a/include/asm-mips/au1xxx_dbdma.h
++++ b/include/asm-mips/au1xxx_dbdma.h
@@ -43,7 +43,7 @@
#define DDMA_GLOBAL_BASE 0xb4003000
#define DDMA_CHANNEL_BASE 0xb4002000
+
#endif /* _LANGUAGE_ASSEMBLY */
#endif /* _AU1000_DBDMA_H_ */
-Index: linux-2.4.35.4/include/asm-mips/au1xxx_gpio.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/asm-mips/au1xxx_gpio.h
++++ b/include/asm-mips/au1xxx_gpio.h
@@ -0,0 +1,22 @@
+
+
+} AU1X00_GPIO2;
+
+#endif //__AU1XXX_GPIO_H
-Index: linux-2.4.35.4/include/asm-mips/au1xxx_psc.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/au1xxx_psc.h
-+++ linux-2.4.35.4/include/asm-mips/au1xxx_psc.h
+--- a/include/asm-mips/au1xxx_psc.h
++++ b/include/asm-mips/au1xxx_psc.h
@@ -41,6 +41,11 @@
#define PSC3_BASE_ADDR 0xb0d00000
#endif
#define PSC_I2SCFG_WI (1 << 15)
#define PSC_I2SCFG_DIV_MASK (3 << 13)
-Index: linux-2.4.35.4/include/asm-mips/bootinfo.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/bootinfo.h
-+++ linux-2.4.35.4/include/asm-mips/bootinfo.h
+--- a/include/asm-mips/bootinfo.h
++++ b/include/asm-mips/bootinfo.h
@@ -180,6 +180,9 @@
#define MACH_MTX1 7 /* 4G MTX-1 Au1500-based board */
#define MACH_CSB250 8 /* Cogent Au1500 */
/*
* Valid machtype for group NEC_VR41XX
-Index: linux-2.4.35.4/include/asm-mips/db1200.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/asm-mips/db1200.h
++++ b/include/asm-mips/db1200.h
@@ -0,0 +1,214 @@
+/*
+ * AMD Alchemy DB1200 Referrence Board
+
+#endif /* __ASM_DB1200_H */
+
-Index: linux-2.4.35.4/include/asm-mips/db1x00.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/db1x00.h
-+++ linux-2.4.35.4/include/asm-mips/db1x00.h
+--- a/include/asm-mips/db1x00.h
++++ b/include/asm-mips/db1x00.h
@@ -1,5 +1,5 @@
/*
- * AMD Alchemy DB1x00 Reference Boards
#endif /* __ASM_DB1X00_H */
-Index: linux-2.4.35.4/include/asm-mips/elf.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/elf.h
-+++ linux-2.4.35.4/include/asm-mips/elf.h
+--- a/include/asm-mips/elf.h
++++ b/include/asm-mips/elf.h
@@ -66,9 +66,10 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#define USE_ELF_CORE_DUMP
#define ELF_EXEC_PAGESIZE PAGE_SIZE
/* This yields a mask that user programs can use to figure out what
instruction set this cpu supports. This could be done in userspace,
-Index: linux-2.4.35.4/include/asm-mips/ficmmp.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/asm-mips/ficmmp.h
++++ b/include/asm-mips/ficmmp.h
@@ -0,0 +1,156 @@
+/*
+ * FIC MMP
+
+#endif /* __ASM_FICMMP_H */
+
-Index: linux-2.4.35.4/include/asm-mips/hazards.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/hazards.h
-+++ linux-2.4.35.4/include/asm-mips/hazards.h
+--- a/include/asm-mips/hazards.h
++++ b/include/asm-mips/hazards.h
@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
+#endif /* __ASSEMBLY__ */
+
#endif /* _ASM_HAZARDS_H */
-Index: linux-2.4.35.4/include/asm-mips/ide.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/ide.h
-+++ linux-2.4.35.4/include/asm-mips/ide.h
+--- a/include/asm-mips/ide.h
++++ b/include/asm-mips/ide.h
@@ -32,12 +32,12 @@ struct ide_ops {
extern struct ide_ops *ide_ops;
#endif /* __KERNEL__ */
-Index: linux-2.4.35.4/include/asm-mips/io.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/io.h
-+++ linux-2.4.35.4/include/asm-mips/io.h
+--- a/include/asm-mips/io.h
++++ b/include/asm-mips/io.h
@@ -392,7 +392,8 @@ static inline unsigned int inl_p(unsigne
return __ioswab32(__val);
}
{
while (count--) {
outl(*(u32 *)addr, port);
-Index: linux-2.4.35.4/include/asm-mips/mipsregs.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/mipsregs.h
-+++ linux-2.4.35.4/include/asm-mips/mipsregs.h
+--- a/include/asm-mips/mipsregs.h
++++ b/include/asm-mips/mipsregs.h
@@ -757,10 +757,18 @@ do { \
#define read_c0_config1() __read_32bit_c0_register($16, 1)
#define read_c0_config2() __read_32bit_c0_register($16, 2)
}
/*
-Index: linux-2.4.35.4/include/asm-mips/mmu_context.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/mmu_context.h
-+++ linux-2.4.35.4/include/asm-mips/mmu_context.h
+--- a/include/asm-mips/mmu_context.h
++++ b/include/asm-mips/mmu_context.h
@@ -27,7 +27,7 @@
#define TLBMISS_HANDLER_SETUP_PGD(pgd) \
pgd_current[smp_processor_id()] = (unsigned long)(pgd)
TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir)
extern unsigned long pgd_current[];
-Index: linux-2.4.35.4/include/asm-mips/pb1100.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/pb1100.h
-+++ linux-2.4.35.4/include/asm-mips/pb1100.h
+--- a/include/asm-mips/pb1100.h
++++ b/include/asm-mips/pb1100.h
@@ -1,5 +1,5 @@
/*
- * Alchemy Semi PB1100 Referrence Board
#endif /* __ASM_PB1100_H */
+
-Index: linux-2.4.35.4/include/asm-mips/pb1200.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/asm-mips/pb1200.h
++++ b/include/asm-mips/pb1200.h
@@ -0,0 +1,244 @@
+/*
+ * AMD Alchemy PB1200 Referrence Board
+
+#endif /* __ASM_PB1200_H */
+
-Index: linux-2.4.35.4/include/asm-mips/pb1550.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/pb1550.h
-+++ linux-2.4.35.4/include/asm-mips/pb1550.h
+--- a/include/asm-mips/pb1550.h
++++ b/include/asm-mips/pb1550.h
@@ -30,13 +30,11 @@
#define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX
+#define AU1XXX_SMC91111_IRQ AU1000_GPIO_3
#endif /* __ASM_PB1550_H */
-Index: linux-2.4.35.4/include/asm-mips/reg.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/reg.h
-+++ linux-2.4.35.4/include/asm-mips/reg.h
+--- a/include/asm-mips/reg.h
++++ b/include/asm-mips/reg.h
@@ -45,6 +45,9 @@
/*
* k0/k1 unsaved
#define EF_SIZE 180 /* size in bytes */
-Index: linux-2.4.35.4/include/asm-mips/sgi/hpc3.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/sgi/hpc3.h
-+++ linux-2.4.35.4/include/asm-mips/sgi/hpc3.h
+--- a/include/asm-mips/sgi/hpc3.h
++++ b/include/asm-mips/sgi/hpc3.h
@@ -128,26 +128,26 @@ struct hpc3_ethregs {
volatile u32 rx_gfptr; /* current GIO fifo ptr */
volatile u32 rx_dfptr; /* current device fifo ptr */
* It is possible to have two HPC3's within the address space on
* one machine, though only having one is more likely on an Indy.
*/
-Index: linux-2.4.35.4/include/asm-mips/tx4927/tx4927.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/tx4927/tx4927.h
-+++ linux-2.4.35.4/include/asm-mips/tx4927/tx4927.h
+--- a/include/asm-mips/tx4927/tx4927.h
++++ b/include/asm-mips/tx4927/tx4927.h
@@ -88,8 +88,8 @@
#define TX4927_ACLC_ACSEMAPH 0xf720
#define TX4927_ACLC_ACGPIDAT 0xf740
#define TX4927_ACLC_ACGPODAT 0xf744
-Index: linux-2.4.35.4/include/asm-mips/unistd.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/unistd.h
-+++ linux-2.4.35.4/include/asm-mips/unistd.h
+--- a/include/asm-mips/unistd.h
++++ b/include/asm-mips/unistd.h
@@ -760,7 +760,7 @@ type name(void) \
if (__a3 == 0) \
return (type) __v0; \
}
#endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */
-Index: linux-2.4.35.4/include/asm-mips64/checksum.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips64/checksum.h
-+++ linux-2.4.35.4/include/asm-mips64/checksum.h
+--- a/include/asm-mips64/checksum.h
++++ b/include/asm-mips64/checksum.h
@@ -144,7 +144,7 @@ static inline unsigned long csum_tcpudp_
"daddu\t%0, %4\n\t"
"dsll32\t$1, %0, 0\n\t"
".set\tat"
: "=&r" (sum)
: "0" (daddr), "r"(saddr),
-Index: linux-2.4.35.4/include/asm-mips64/elf.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips64/elf.h
-+++ linux-2.4.35.4/include/asm-mips64/elf.h
+--- a/include/asm-mips64/elf.h
++++ b/include/asm-mips64/elf.h
@@ -64,9 +64,10 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#define USE_ELF_CORE_DUMP
#define ELF_EXEC_PAGESIZE PAGE_SIZE
/* This yields a mask that user programs can use to figure out what
instruction set this cpu supports. This could be done in userspace,
-Index: linux-2.4.35.4/include/asm-mips64/hazards.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips64/hazards.h
-+++ linux-2.4.35.4/include/asm-mips64/hazards.h
+--- a/include/asm-mips64/hazards.h
++++ b/include/asm-mips64/hazards.h
@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
+#endif /* __ASSEMBLY__ */
+
#endif /* _ASM_HAZARDS_H */
-Index: linux-2.4.35.4/include/asm-mips64/ide.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips64/ide.h
-+++ linux-2.4.35.4/include/asm-mips64/ide.h
+--- a/include/asm-mips64/ide.h
++++ b/include/asm-mips64/ide.h
@@ -32,12 +32,12 @@ struct ide_ops {
extern struct ide_ops *ide_ops;
#endif /* __KERNEL__ */
-Index: linux-2.4.35.4/include/asm-mips64/io.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips64/io.h
-+++ linux-2.4.35.4/include/asm-mips64/io.h
+--- a/include/asm-mips64/io.h
++++ b/include/asm-mips64/io.h
@@ -414,7 +414,8 @@ static inline unsigned int inl_p(unsigne
return __ioswab32(__val);
}
{
while (count--) {
outl(*(u32 *)addr, port);
-Index: linux-2.4.35.4/include/asm-mips64/mipsregs.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips64/mipsregs.h
-+++ linux-2.4.35.4/include/asm-mips64/mipsregs.h
+--- a/include/asm-mips64/mipsregs.h
++++ b/include/asm-mips64/mipsregs.h
@@ -757,10 +757,18 @@ do { \
#define read_c0_config1() __read_32bit_c0_register($16, 1)
#define read_c0_config2() __read_32bit_c0_register($16, 2)
}
/*
-Index: linux-2.4.35.4/include/asm-mips64/reg.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips64/reg.h
-+++ linux-2.4.35.4/include/asm-mips64/reg.h
+--- a/include/asm-mips64/reg.h
++++ b/include/asm-mips64/reg.h
@@ -46,6 +46,9 @@
/*
* k0/k1 unsaved
#define EF_REG28 28
#define EF_REG29 29
#define EF_REG30 30
-Index: linux-2.4.35.4/include/asm-mips64/sgi/hpc3.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips64/sgi/hpc3.h
-+++ linux-2.4.35.4/include/asm-mips64/sgi/hpc3.h
+--- a/include/asm-mips64/sgi/hpc3.h
++++ b/include/asm-mips64/sgi/hpc3.h
@@ -128,26 +128,26 @@ struct hpc3_ethregs {
volatile u32 rx_gfptr; /* current GIO fifo ptr */
volatile u32 rx_dfptr; /* current device fifo ptr */
* It is possible to have two HPC3's within the address space on
* one machine, though only having one is more likely on an Indy.
*/
-Index: linux-2.4.35.4/include/asm-mips64/sn/nmi.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips64/sn/nmi.h
-+++ linux-2.4.35.4/include/asm-mips64/sn/nmi.h
+--- a/include/asm-mips64/sn/nmi.h
++++ b/include/asm-mips64/sn/nmi.h
@@ -8,7 +8,7 @@
#ifndef __ASM_SN_NMI_H
#define __ASM_SN_NMI_H
#include <asm/sn/addrs.h>
-Index: linux-2.4.35.4/include/asm-mips64/unistd.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips64/unistd.h
-+++ linux-2.4.35.4/include/asm-mips64/unistd.h
+--- a/include/asm-mips64/unistd.h
++++ b/include/asm-mips64/unistd.h
@@ -760,7 +760,7 @@ type name(void) \
if (__a3 == 0) \
return (type) __v0; \
}
#endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */
-Index: linux-2.4.35.4/include/asm-ppc/param.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-ppc/param.h
-+++ linux-2.4.35.4/include/asm-ppc/param.h
+--- a/include/asm-ppc/param.h
++++ b/include/asm-ppc/param.h
@@ -3,6 +3,9 @@
#ifndef HZ
#endif
#define EXEC_PAGESIZE 4096
-Index: linux-2.4.35.4/include/asm-s390/param.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-s390/param.h
-+++ linux-2.4.35.4/include/asm-s390/param.h
+--- a/include/asm-s390/param.h
++++ b/include/asm-s390/param.h
@@ -11,6 +11,9 @@
#ifndef HZ
#endif
#define EXEC_PAGESIZE 4096
-Index: linux-2.4.35.4/include/asm-sh/param.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-sh/param.h
-+++ linux-2.4.35.4/include/asm-sh/param.h
+--- a/include/asm-sh/param.h
++++ b/include/asm-sh/param.h
@@ -3,6 +3,9 @@
#ifndef HZ
#endif
#define EXEC_PAGESIZE 4096
-Index: linux-2.4.35.4/include/asm-sparc/param.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-sparc/param.h
-+++ linux-2.4.35.4/include/asm-sparc/param.h
+--- a/include/asm-sparc/param.h
++++ b/include/asm-sparc/param.h
@@ -4,6 +4,9 @@
#ifndef HZ
#endif
#define EXEC_PAGESIZE 8192 /* Thanks for sun4's we carry baggage... */
-Index: linux-2.4.35.4/include/asm-sparc64/param.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-sparc64/param.h
-+++ linux-2.4.35.4/include/asm-sparc64/param.h
+--- a/include/asm-sparc64/param.h
++++ b/include/asm-sparc64/param.h
@@ -4,6 +4,9 @@
#ifndef HZ
#endif
#define EXEC_PAGESIZE 8192 /* Thanks for sun4's we carry baggage... */
-Index: linux-2.4.35.4/include/linux/i2c-algo-au1550.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/i2c-algo-au1550.h
++++ b/include/linux/i2c-algo-au1550.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2004 Embedded Edge, LLC <dan@embeddededge.com>
+int i2c_au1550_del_bus(struct i2c_adapter *);
+
+#endif /* I2C_ALGO_AU1550_H */
-Index: linux-2.4.35.4/include/linux/i2c-id.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/i2c-id.h
-+++ linux-2.4.35.4/include/linux/i2c-id.h
+--- a/include/linux/i2c-id.h
++++ b/include/linux/i2c-id.h
@@ -155,6 +155,8 @@
#define I2C_ALGO_SIBYTE 0x150000 /* Broadcom SiByte SOCs */
#define I2C_ALGO_SGI 0x160000 /* SGI algorithm */
/* --- SMBus only adapters */
#define I2C_HW_SMBUS_PIIX4 0x00
#define I2C_HW_SMBUS_ALI15X3 0x01
-Index: linux-2.4.35.4/include/linux/sched.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/sched.h
-+++ linux-2.4.35.4/include/linux/sched.h
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
@@ -617,6 +617,10 @@ asmlinkage long sys_wait4(pid_t pid,unsi
extern int in_group_p(gid_t);
extern int in_egroup_p(gid_t);
extern void proc_caches_init(void);
extern void flush_signals(struct task_struct *);
extern void flush_signal_handlers(struct task_struct *);
-Index: linux-2.4.35.4/include/linux/serial.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/serial.h
-+++ linux-2.4.35.4/include/linux/serial.h
+--- a/include/linux/serial.h
++++ b/include/linux/serial.h
@@ -75,7 +75,8 @@ struct serial_struct {
#define PORT_16654 11
#define PORT_16850 12
#define SERIAL_IO_PORT 0
#define SERIAL_IO_HUB6 1
-Index: linux-2.4.35.4/include/linux/swap.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/swap.h
-+++ linux-2.4.35.4/include/linux/swap.h
+--- a/include/linux/swap.h
++++ b/include/linux/swap.h
@@ -1,6 +1,12 @@
#ifndef _LINUX_SWAP_H
#define _LINUX_SWAP_H
/*
* Max bad pages in the new format..
*/
-Index: linux-2.4.35.4/include/video/newport.h
-===================================================================
---- linux-2.4.35.4.orig/include/video/newport.h
-+++ linux-2.4.35.4/include/video/newport.h
+--- a/include/video/newport.h
++++ b/include/video/newport.h
@@ -291,8 +291,6 @@ struct newport_regs {
unsigned int _unused2[0x1ef];
struct newport_cregs cgo;
while ((rex->set.dcbdata0.bybytes.b3 & 3) != XM9_FIFO_EMPTY)
;
-Index: linux-2.4.35.4/init/main.c
-===================================================================
---- linux-2.4.35.4.orig/init/main.c
-+++ linux-2.4.35.4/init/main.c
+--- a/init/main.c
++++ b/init/main.c
@@ -296,7 +296,6 @@ static void __init parse_options(char *l
unsigned long wait_init_idle;
-Index: linux-2.4.35.4/kernel/exit.c
-===================================================================
---- linux-2.4.35.4.orig/kernel/exit.c
-+++ linux-2.4.35.4/kernel/exit.c
+--- a/kernel/exit.c
++++ b/kernel/exit.c
@@ -26,7 +26,7 @@ extern struct task_struct *child_reaper;
int getrusage(struct task_struct *, int, struct rusage *);
{
if (p != current) {
#ifdef CONFIG_SMP
-Index: linux-2.4.35.4/kernel/signal.c
-===================================================================
---- linux-2.4.35.4.orig/kernel/signal.c
-+++ linux-2.4.35.4/kernel/signal.c
+--- a/kernel/signal.c
++++ b/kernel/signal.c
@@ -14,6 +14,7 @@
#include <linux/init.h>
#include <linux/sched.h>
status = tsk->exit_code & 0x7f;
why = SI_KERNEL; /* shouldn't happen */
-Index: linux-2.4.35.4/kernel/sys.c
-===================================================================
---- linux-2.4.35.4.orig/kernel/sys.c
-+++ linux-2.4.35.4/kernel/sys.c
+--- a/kernel/sys.c
++++ b/kernel/sys.c
@@ -801,16 +801,23 @@ asmlinkage long sys_setfsgid(gid_t gid)
asmlinkage long sys_times(struct tms * tbuf)
}
/*
-Index: linux-2.4.35.4/lib/Makefile
-===================================================================
---- linux-2.4.35.4.orig/lib/Makefile
-+++ linux-2.4.35.4/lib/Makefile
+--- a/lib/Makefile
++++ b/lib/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_CRC32) += crc32.o
subdir-$(CONFIG_ZLIB_INFLATE) += zlib_inflate
subdir-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate
include $(TOPDIR)/drivers/net/Makefile.lib
include $(TOPDIR)/drivers/usb/Makefile.lib
include $(TOPDIR)/drivers/bluetooth/Makefile.lib
-Index: linux-2.4.35.4/Makefile
-===================================================================
---- linux-2.4.35.4.orig/Makefile
-+++ linux-2.4.35.4/Makefile
+--- a/Makefile
++++ b/Makefile
@@ -469,10 +469,11 @@ mrproper: clean archmrproper
$(MAKE) -C Documentation/DocBook mrproper
-Index: linux-2.4.35.4/fs/Config.in
-===================================================================
---- linux-2.4.35.4.orig/fs/Config.in
-+++ linux-2.4.35.4/fs/Config.in
+--- a/fs/Config.in
++++ b/fs/Config.in
@@ -51,6 +51,14 @@ if [ "$CONFIG_JFFS2_FS" = "y" -o "$CONFI
int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0
fi
bool 'Virtual memory file system support (former shm fs)' CONFIG_TMPFS
define_bool CONFIG_RAMFS y
-Index: linux-2.4.35.4/fs/Makefile
-===================================================================
---- linux-2.4.35.4.orig/fs/Makefile
-+++ linux-2.4.35.4/fs/Makefile
+--- a/fs/Makefile
++++ b/fs/Makefile
@@ -65,6 +65,7 @@ subdir-$(CONFIG_REISERFS_FS) += reiserfs
subdir-$(CONFIG_DEVPTS_FS) += devpts
subdir-$(CONFIG_SUN_OPENPROMFS) += openpromfs
subdir-$(CONFIG_JFS_FS) += jfs
subdir-$(CONFIG_XFS_FS) += xfs
-Index: linux-2.4.35.4/fs/squashfs/inode.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/squashfs/inode.c
++++ b/fs/squashfs/inode.c
@@ -0,0 +1,2028 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
+MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
+MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
+MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/fs/squashfs/Makefile
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/squashfs/Makefile
++++ b/fs/squashfs/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for the linux squashfs routines.
+obj-m := $(O_TARGET)
+
+include $(TOPDIR)/Rules.make
-Index: linux-2.4.35.4/fs/squashfs/squashfs2_0.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/squashfs/squashfs2_0.c
++++ b/fs/squashfs/squashfs2_0.c
@@ -0,0 +1,751 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
+
+ return 1;
+}
-Index: linux-2.4.35.4/fs/squashfs/squashfs.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/squashfs/squashfs.h
++++ b/fs/squashfs/squashfs.h
@@ -0,0 +1,85 @@
+/*
+ * Squashfs - a compressed read only filesystem for Linux
+ return 0;
+}
+#endif
-Index: linux-2.4.35.4/include/linux/fs.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/fs.h
-+++ linux-2.4.35.4/include/linux/fs.h
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
@@ -324,6 +324,7 @@ extern void set_bh_page(struct buffer_he
#include <linux/usbdev_fs_i.h>
#include <linux/jffs2_fs_i.h>
void *generic_sbp;
} u;
/*
-Index: linux-2.4.35.4/include/linux/squashfs_fs.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/squashfs_fs.h
++++ b/include/linux/squashfs_fs.h
@@ -0,0 +1,915 @@
+#ifndef SQUASHFS_FS
+#define SQUASHFS_FS
+
+#endif
+#endif
-Index: linux-2.4.35.4/include/linux/squashfs_fs_i.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/squashfs_fs_i.h
++++ b/include/linux/squashfs_fs_i.h
@@ -0,0 +1,44 @@
+#ifndef SQUASHFS_FS_I
+#define SQUASHFS_FS_I
+ } u;
+};
+#endif
-Index: linux-2.4.35.4/include/linux/squashfs_fs_sb.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/squashfs_fs_sb.h
++++ b/include/linux/squashfs_fs_sb.h
@@ -0,0 +1,74 @@
+#ifndef SQUASHFS_FS_SB
+#define SQUASHFS_FS_SB
+ int (*read_fragment_index_table)(struct super_block *s);
+};
+#endif
-Index: linux-2.4.35.4/init/do_mounts.c
-===================================================================
---- linux-2.4.35.4.orig/init/do_mounts.c
-+++ linux-2.4.35.4/init/do_mounts.c
+--- a/init/do_mounts.c
++++ b/init/do_mounts.c
@@ -15,6 +15,7 @@
#include <linux/minix_fs.h>
#include <linux/ext2_fs.h>
/*
* Read block 1 to test for minix and ext2 superblock
*/
-Index: linux-2.4.35.4/lib/Config.in
-===================================================================
---- linux-2.4.35.4.orig/lib/Config.in
-+++ linux-2.4.35.4/lib/Config.in
+--- a/lib/Config.in
++++ b/lib/Config.in
@@ -10,6 +10,7 @@ tristate 'CRC32 functions' CONFIG_CRC32
# Do we need the compression support?
#
-Index: linux-2.4.35.4/fs/squashfs/inode.c
-===================================================================
---- linux-2.4.35.4.orig/fs/squashfs/inode.c
-+++ linux-2.4.35.4/fs/squashfs/inode.c
+--- a/fs/squashfs/inode.c
++++ b/fs/squashfs/inode.c
@@ -4,6 +4,9 @@
* Copyright (c) 2002, 2003, 2004, 2005, 2006
* Phillip Lougher <phillip@lougher.org.uk>
unregister_filesystem(&squashfs_fs_type);
}
-Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/squashfs/LzmaDecode.c
++++ b/fs/squashfs/LzmaDecode.c
@@ -0,0 +1,663 @@
+/*
+ LzmaDecode.c
+ *outSizeProcessed = nowPos;
+ return LZMA_RESULT_OK;
+}
-Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/squashfs/LzmaDecode.h
++++ b/fs/squashfs/LzmaDecode.h
@@ -0,0 +1,100 @@
+/*
+ LzmaDecode.h
+ UInt32 *outSizeProcessed);
+
+#endif
-Index: linux-2.4.35.4/fs/squashfs/Makefile
-===================================================================
---- linux-2.4.35.4.orig/fs/squashfs/Makefile
-+++ linux-2.4.35.4/fs/squashfs/Makefile
+--- a/fs/squashfs/Makefile
++++ b/fs/squashfs/Makefile
@@ -4,7 +4,7 @@
O_TARGET := squashfs.o
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
@@ -17580,6 +17580,32 @@ CONFIG_JFFS2_FS_DEBUG
If reporting bugs, please try to have available a full dump of the
messages at debug level 1 while the misbehaviour was occurring.
JFFS stats available in /proc filesystem
CONFIG_JFFS_PROC_FS
Enabling this option will cause statistics from mounted JFFS file systems
-Index: linux-2.4.35.4/fs/Config.in
-===================================================================
---- linux-2.4.35.4.orig/fs/Config.in
-+++ linux-2.4.35.4/fs/Config.in
+--- a/fs/Config.in
++++ b/fs/Config.in
@@ -50,6 +50,12 @@ dep_tristate 'Journalling Flash File Sys
if [ "$CONFIG_JFFS2_FS" = "y" -o "$CONFIG_JFFS2_FS" = "m" ] ; then
int 'JFFS2 debugging verbosity (0 = quiet, 2 = noisy)' CONFIG_JFFS2_FS_DEBUG 0
tristate 'Compressed ROM file system support' CONFIG_CRAMFS
tristate 'Squashed file system support' CONFIG_SQUASHFS
if [ "$CONFIG_SQUASHFS" = "y" -o "$CONFIG_SQUASHFS" = "m" ] ; then
-Index: linux-2.4.35.4/fs/jffs2/Config.in.bbc.inc
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/Config.in.bbc.inc
++++ b/fs/jffs2/Config.in.bbc.inc
@@ -0,0 +1,5 @@
+dep_mbool ' ARMLIB compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_ARMLIB $CONFIG_JFFS2_FS
+dep_mbool ' LZO1X-* compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZO $CONFIG_JFFS2_FS
+dep_mbool ' LZARI compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZARI $CONFIG_JFFS2_FS
+dep_mbool ' LZHD compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZHD $CONFIG_JFFS2_FS
+dep_mbool ' LZSS compression support for BBC (EXPERIMENTAL)' CONFIG_JFFS2_BBC_LZSS $CONFIG_JFFS2_FS
-Index: linux-2.4.35.4/fs/jffs2/Configure.help.bbc.inc
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/Configure.help.bbc.inc
++++ b/fs/jffs2/Configure.help.bbc.inc
@@ -0,0 +1,25 @@
+ARMLIB compression support for BBC (EXPERIMENTAL)
+CONFIG_JFFS2_BBC_ARMLIB
+ This enables simple LempelZiv-Storer-Szymanski compression for BBC
+ (faster than LZHD, and, and has a not-so-good compression ratio,
+ was included just for testing)
-Index: linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc
++++ b/fs/jffs2/Kconfig.bbc.inc
@@ -0,0 +1,40 @@
+config JFFS2_BBC_ARMLIB
+ bool "ARMLIB compression support for BBC (EXPERIMENTAL)"
+ This enables simple LempelZiv-Storer-Szymanski compression for BBC
+ (faster than LZHD, and, and has a not-so-good compression ratio,
+ was included just for testing)
-Index: linux-2.4.35.4/fs/jffs2/Makefile
-===================================================================
---- linux-2.4.35.4.orig/fs/jffs2/Makefile
-+++ linux-2.4.35.4/fs/jffs2/Makefile
+--- a/fs/jffs2/Makefile
++++ b/fs/jffs2/Makefile
@@ -10,9 +10,23 @@
# Note 2! The CFLAGS definitions are now in the main makefile...
read.o nodemgmt.o readinode.o super.o write.o scan.o gc.o \
symlink.o build.o erase.o background.o
-Index: linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc
++++ b/fs/jffs2/Makefile.bbc.inc
@@ -0,0 +1,12 @@
+JFFS2_BBC_KERNEL_OBJS-y = jffs2_bbc_framework.o jffs2_bbc_fs.o
+
+
+JFFS2_BBC_MKFS_OBJS = jffs2_bbc_mkfs.o jffs2_bbc_framework.o jffs2_bbc_armlib_comp.o jffs2_bbc_lzo_comp.o\
+ jffs2_bbc_lzss_comp.o jffs2_bbc_lzari_comp.o jffs2_bbc_lzhd_comp.o
-Index: linux-2.4.35.4/fs/jffs2/compr_zlib.c
-===================================================================
---- linux-2.4.35.4.orig/fs/jffs2/compr_zlib.c
-+++ linux-2.4.35.4/fs/jffs2/compr_zlib.c
+--- a/fs/jffs2/compr_zlib.c
++++ b/fs/jffs2/compr_zlib.c
@@ -85,7 +85,7 @@ void jffs2_zlib_exit(void)
vfree(inflate_workspace);
}
+ jffs2_zlib_decompress(data_in,cpage_out,srclen,destlen);
+}
+
-Index: linux-2.4.35.4/fs/jffs2/file.c
-===================================================================
---- linux-2.4.35.4.orig/fs/jffs2/file.c
-+++ linux-2.4.35.4/fs/jffs2/file.c
+--- a/fs/jffs2/file.c
++++ b/fs/jffs2/file.c
@@ -35,6 +35,7 @@
*
*/
comprtype = jffs2_compress(page_address(pg)+ (file_ofs & (PAGE_CACHE_SIZE-1)), comprbuf, &datalen, &cdatalen);
}
if (comprtype == JFFS2_COMPR_NONE) {
-Index: linux-2.4.35.4/fs/jffs2/gc.c
-===================================================================
---- linux-2.4.35.4.orig/fs/jffs2/gc.c
-+++ linux-2.4.35.4/fs/jffs2/gc.c
+--- a/fs/jffs2/gc.c
++++ b/fs/jffs2/gc.c
@@ -35,6 +35,7 @@
*
*/
comprtype = jffs2_compress(writebuf, comprbuf, &datalen, &cdatalen);
}
if (comprtype) {
-Index: linux-2.4.35.4/fs/jffs2/hpatch
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/hpatch
++++ b/fs/jffs2/hpatch
@@ -0,0 +1,191 @@
+#!/usr/bin/perl
+# A patch-like utility
+}
+file_end();
+close(CMD);
-Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c
++++ b/fs/jffs2/jffs2_bbc_armlib_comp.c
@@ -0,0 +1,2224 @@
+/*
+ * JFFS2-BBC: armlib compressor plugin
+}
+
+/*END OF ARMLIB*/
-Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c
++++ b/fs/jffs2/jffs2_bbc_framework.c
@@ -0,0 +1,1324 @@
+/*
+ * JFFS2-BBC: Compression Framework
+}
+
+#endif
-Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h
++++ b/fs/jffs2/jffs2_bbc_framework.h
@@ -0,0 +1,202 @@
+/*
+ * JFFS2-BBC: Compression Framework - headers
+int jffs2_bbc_get_memory_counter(void);
+
+#endif
-Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c
++++ b/fs/jffs2/jffs2_bbc_fs.c
@@ -0,0 +1,331 @@
+/*
+ * JFFS2-BBC: File System Extension for Linux Kernel
+ jffs2_bbc_compressor_deinit();
+ remove_proc_entry("jffs2_bbc", NULL);
+}
-Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h
++++ b/fs/jffs2/jffs2_bbc_fs.h
@@ -0,0 +1,30 @@
+/*
+ * JFFS2 BBC: File System Extension for Linux Kernel - headers
+
+void jffs2_bbc_proc_init(void);
+void jffs2_bbc_proc_deinit(void);
-Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c
++++ b/fs/jffs2/jffs2_bbc_lzari_comp.c
@@ -0,0 +1,788 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+
+{
+ jffs2_bbc_unregister_compressor (&jffs2_bbc_lzari);
+}
-Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c
++++ b/fs/jffs2/jffs2_bbc_lzhd_comp.c
@@ -0,0 +1,747 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+
+{
+ jffs2_bbc_unregister_compressor (&jffs2_bbc_lzhd);
+}
-Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c
++++ b/fs/jffs2/jffs2_bbc_lzo_comp.c
@@ -0,0 +1,2435 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+
+{
+ jffs2_bbc_unregister_compressor (&jffs2_bbc_lzo);
+}
-Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c
++++ b/fs/jffs2/jffs2_bbc_lzss_comp.c
@@ -0,0 +1,385 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+
+{
+ jffs2_bbc_unregister_compressor (&jffs2_bbc_lzss);
+}
-Index: linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch
++++ b/fs/jffs2/linux-2.4.25.hpatch
@@ -0,0 +1,97 @@
+FMakefile
+=BBC insertion
+?{
++ jffs2_bbc_proc_deinit(); /**BBC**/
++
-Index: linux-2.4.35.4/fs/jffs2/read.c
-===================================================================
---- linux-2.4.35.4.orig/fs/jffs2/read.c
-+++ linux-2.4.35.4/fs/jffs2/read.c
+--- a/fs/jffs2/read.c
++++ b/fs/jffs2/read.c
@@ -35,6 +35,7 @@
*
*/
ret = jffs2_decompress(ri->compr, readbuf, decomprbuf, ri->csize, ri->dsize);
if (ret) {
printk(KERN_WARNING "Error: jffs2_decompress returned %d\n", ret);
-Index: linux-2.4.35.4/fs/jffs2/super.c
-===================================================================
---- linux-2.4.35.4.orig/fs/jffs2/super.c
-+++ linux-2.4.35.4/fs/jffs2/super.c
+--- a/fs/jffs2/super.c
++++ b/fs/jffs2/super.c
@@ -35,6 +35,7 @@
*
*/
-Index: linux-2.4.35.4/include/asm-mips/param.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/param.h
-+++ linux-2.4.35.4/include/asm-mips/param.h
+--- a/include/asm-mips/param.h
++++ b/include/asm-mips/param.h
@@ -55,7 +55,7 @@
#endif /* defined(__KERNEL__) */
#endif /* defined(HZ) */
-Index: linux-2.4.35.4/drivers/mtd/chips/Config.in
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/chips/Config.in
-+++ linux-2.4.35.4/drivers/mtd/chips/Config.in
+--- a/drivers/mtd/chips/Config.in
++++ b/drivers/mtd/chips/Config.in
@@ -45,6 +45,7 @@ fi
dep_tristate ' Support for Intel/Sharp flash chips' CONFIG_MTD_CFI_INTELEXT $CONFIG_MTD_GEN_PROBE
dep_tristate ' Support for AMD/Fujitsu flash chips' CONFIG_MTD_CFI_AMDSTD $CONFIG_MTD_GEN_PROBE
dep_tristate ' Support for RAM chips in bus mapping' CONFIG_MTD_RAM $CONFIG_MTD
dep_tristate ' Support for ROM chips in bus mapping' CONFIG_MTD_ROM $CONFIG_MTD
-Index: linux-2.4.35.4/drivers/mtd/chips/Makefile
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/chips/Makefile
-+++ linux-2.4.35.4/drivers/mtd/chips/Makefile
+--- a/drivers/mtd/chips/Makefile
++++ b/drivers/mtd/chips/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_MTD) += chipreg.o
obj-$(CONFIG_MTD_AMDSTD) += amd_flash.o
obj-$(CONFIG_MTD_CFI) += cfi_probe.o
obj-$(CONFIG_MTD_CFI_AMDSTD) += cfi_cmdset_0002.o
obj-$(CONFIG_MTD_CFI_INTELEXT) += cfi_cmdset_0001.o
obj-$(CONFIG_MTD_GEN_PROBE) += gen_probe.o
-Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c
++++ b/drivers/mtd/chips/cfi_cmdset_0701.c
@@ -0,0 +1,855 @@
+/*
+ * Common Flash Interface support:
+module_init(cfi_sststd_init);
+module_exit(cfi_sststd_exit);
+
-Index: linux-2.4.35.4/drivers/mtd/chips/cfi_probe.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/chips/cfi_probe.c
-+++ linux-2.4.35.4/drivers/mtd/chips/cfi_probe.c
+--- a/drivers/mtd/chips/cfi_probe.c
++++ b/drivers/mtd/chips/cfi_probe.c
@@ -67,8 +67,15 @@ static int cfi_probe_chip(struct map_inf
cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL);
cfi_send_gen_cmd(0x98, 0x55, base, map, cfi, cfi->device_type, NULL);
if (!cfi->numchips) {
/* This is the first time we're called. Set up the CFI
-Index: linux-2.4.35.4/drivers/mtd/chips/gen_probe.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/chips/gen_probe.c
-+++ linux-2.4.35.4/drivers/mtd/chips/gen_probe.c
+--- a/drivers/mtd/chips/gen_probe.c
++++ b/drivers/mtd/chips/gen_probe.c
@@ -328,13 +328,18 @@ static struct mtd_info *check_cmd_set(st
return cfi_cmdset_0001(map, primary);
#endif
-Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/chips/cfi_cmdset_0001.c
-+++ linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c
+--- a/drivers/mtd/chips/cfi_cmdset_0001.c
++++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -28,10 +28,18 @@
#include <linux/slab.h>
#include <linux/delay.h>
kfree(cfi->cmdset_priv);
kfree(cfi->cfiq);
kfree(cfi);
-Index: linux-2.4.35.4/include/linux/mtd/mtd.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/mtd/mtd.h
-+++ linux-2.4.35.4/include/linux/mtd/mtd.h
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
@@ -10,6 +10,7 @@
#include <linux/version.h>
#include <linux/types.h>
-Index: linux-2.4.35.4/drivers/mtd/mtdchar.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/mtdchar.c
-+++ linux-2.4.35.4/drivers/mtd/mtdchar.c
+--- a/drivers/mtd/mtdchar.c
++++ b/drivers/mtd/mtdchar.c
@@ -558,13 +558,13 @@ static void mtd_notify_add(struct mtd_in
sprintf(name, "%d", mtd->index);
devfs_rw_handle[mtd->index] = devfs_register(devfs_dir_handle, name,
&mtd_fops, NULL);
}
-Index: linux-2.4.35.4/drivers/mtd/mtdblock.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/mtd/mtdblock.c
-+++ linux-2.4.35.4/drivers/mtd/mtdblock.c
+--- a/drivers/mtd/mtdblock.c
++++ b/drivers/mtd/mtdblock.c
@@ -601,7 +601,7 @@ static void mtd_notify_add(struct mtd_in
sprintf(name, "%d", mtd->index);
devfs_rw_handle[mtd->index] = devfs_register(devfs_dir_handle, name,
-Index: linux-2.4.35.4/fs/squashfs/Makefile
-===================================================================
---- linux-2.4.35.4.orig/fs/squashfs/Makefile
-+++ linux-2.4.35.4/fs/squashfs/Makefile
+--- a/fs/squashfs/Makefile
++++ b/fs/squashfs/Makefile
@@ -4,7 +4,7 @@
O_TARGET := squashfs.o
obj-m := $(O_TARGET)
-Index: linux-2.4.35.4/fs/squashfs/squashfs.h
-===================================================================
---- linux-2.4.35.4.orig/fs/squashfs/squashfs.h
-+++ linux-2.4.35.4/fs/squashfs/squashfs.h
+--- a/fs/squashfs/squashfs.h
++++ b/fs/squashfs/squashfs.h
@@ -24,6 +24,9 @@
#ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY
#undef CONFIG_SQUASHFS_1_0_COMPATIBILITY
-Index: linux-2.4.35.4/arch/mips/Makefile
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/Makefile
-+++ linux-2.4.35.4/arch/mips/Makefile
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
@@ -44,10 +44,10 @@ MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
GCCFLAGS := -I $(TOPDIR)/include/asm/gcc
GCCFLAGS += -G 0 -mno-abicalls -fno-pic -pipe
CFLAGS += $(GCCFLAGS)
LD += -m $(ld-emul)
-Index: linux-2.4.35.4/Makefile
-===================================================================
---- linux-2.4.35.4.orig/Makefile
-+++ linux-2.4.35.4/Makefile
+--- a/Makefile
++++ b/Makefile
@@ -17,7 +17,7 @@ HPATH = $(TOPDIR)/include
FINDHPATH = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu
-Index: linux-2.4.35.4/arch/mips/Makefile
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/Makefile
-+++ linux-2.4.35.4/arch/mips/Makefile
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
@@ -739,6 +739,7 @@ LINKFLAGS += -T arch/$(ARCH)/ld.script
HEAD := arch/mips/kernel/head.o arch/mips/kernel/init_task.o
-Index: linux-2.4.35.4/Makefile
-===================================================================
---- linux-2.4.35.4.orig/Makefile
-+++ linux-2.4.35.4/Makefile
+--- a/Makefile
++++ b/Makefile
@@ -428,18 +428,9 @@ else
depmod_opts := -b $(INSTALL_MOD_PATH) -r
endif
-Index: linux-2.4.35.4/include/linux/netdevice.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/netdevice.h
-+++ linux-2.4.35.4/include/linux/netdevice.h
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
@@ -295,7 +295,9 @@ struct net_device
/* List of functions to handle Wireless Extensions (instead of ioctl).
struct ethtool_ops *ethtool_ops;
-Index: linux-2.4.35.4/include/linux/wireless.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/wireless.h
-+++ linux-2.4.35.4/include/linux/wireless.h
+--- a/include/linux/wireless.h
++++ b/include/linux/wireless.h
@@ -1,10 +1,10 @@
/*
* This file define a set of standard wireless extensions
};
/*
-Index: linux-2.4.35.4/include/net/iw_handler.h
-===================================================================
---- linux-2.4.35.4.orig/include/net/iw_handler.h
-+++ linux-2.4.35.4/include/net/iw_handler.h
+--- a/include/net/iw_handler.h
++++ b/include/net/iw_handler.h
@@ -1,10 +1,10 @@
/*
* This file define the new driver API for Wireless Extensions
};
/**************************** PROTOTYPES ****************************/
-Index: linux-2.4.35.4/net/core/dev.c
-===================================================================
---- linux-2.4.35.4.orig/net/core/dev.c
-+++ linux-2.4.35.4/net/core/dev.c
+--- a/net/core/dev.c
++++ b/net/core/dev.c
@@ -2426,7 +2426,7 @@ int dev_ioctl(unsigned int cmd, void *ar
/* Follow me in net/core/wireless.c */
ret = wireless_process_ioctl(&ifr, cmd);
copy_to_user(arg, &ifr, sizeof(struct ifreq)))
return -EFAULT;
return ret;
-Index: linux-2.4.35.4/net/core/wireless.c
-===================================================================
---- linux-2.4.35.4.orig/net/core/wireless.c
-+++ linux-2.4.35.4/net/core/wireless.c
+--- a/net/core/wireless.c
++++ b/net/core/wireless.c
@@ -2,7 +2,7 @@
* This file implement the Wireless Extensions APIs.
*
http://www.polbox.com/h/hs001/linux-2.4.29-mppe-mppc-1.3.patch.gz
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
@@ -9974,6 +9974,28 @@ CONFIG_PPP_BSDCOMP
module; it is called bsd_comp.o and will show up in the directory
modules once you have said "make modules". If unsure, say N.
PPP over Ethernet
CONFIG_PPPOE
Support for PPP over Ethernet.
-Index: linux-2.4.35.4/crypto/Config.in
-===================================================================
---- linux-2.4.35.4.orig/crypto/Config.in
-+++ linux-2.4.35.4/crypto/Config.in
+--- a/crypto/Config.in
++++ b/crypto/Config.in
@@ -11,7 +11,9 @@ if [ "$CONFIG_INET_AH" = "y" -o \
"$CONFIG_INET6_AH" = "y" -o \
"$CONFIG_INET6_AH" = "m" -o \
if [ "$CONFIG_INET_IPCOMP" = "y" -o \
"$CONFIG_INET_IPCOMP" = "m" -o \
"$CONFIG_INET6_IPCOMP" = "y" -o \
-Index: linux-2.4.35.4/drivers/net/Config.in
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/Config.in
-+++ linux-2.4.35.4/drivers/net/Config.in
+--- a/drivers/net/Config.in
++++ b/drivers/net/Config.in
@@ -336,6 +336,7 @@ if [ ! "$CONFIG_PPP" = "n" ]; then
dep_tristate ' PPP support for sync tty ports' CONFIG_PPP_SYNC_TTY $CONFIG_PPP
dep_tristate ' PPP Deflate compression' CONFIG_PPP_DEFLATE $CONFIG_PPP
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
dep_tristate ' PPP over Ethernet (EXPERIMENTAL)' CONFIG_PPPOE $CONFIG_PPP
fi
-Index: linux-2.4.35.4/drivers/net/Makefile
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/Makefile
-+++ linux-2.4.35.4/drivers/net/Makefile
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
@@ -166,6 +166,7 @@ obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o
obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
obj-$(CONFIG_SLIP) += slip.o
-Index: linux-2.4.35.4/drivers/net/ppp_generic.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/ppp_generic.c
-+++ linux-2.4.35.4/drivers/net/ppp_generic.c
+--- a/drivers/net/ppp_generic.c
++++ b/drivers/net/ppp_generic.c
@@ -19,7 +19,7 @@
* PPP driver, written by Michael Callahan and Al Longyear, and
* subsequently hacked by Paul Mackerras.
init_ppp_file(&ppp->file, INTERFACE);
ppp->file.hdrlen = PPP_HDRLEN - 2; /* don't count proto bytes */
for (i = 0; i < NUM_NP; ++i)
-Index: linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c
++++ b/drivers/net/ppp_mppe_mppc.c
@@ -0,0 +1,1312 @@
+/*
+ * ppp_mppe_mppc.c - MPPC/MPPE "compressor/decompressor" module.
+MODULE_AUTHOR("Jan Dubiec <jdx@slackware.pl>");
+MODULE_DESCRIPTION("MPPE/MPPC encryption/compression module for Linux");
+MODULE_LICENSE("Dual BSD/GPL");
-Index: linux-2.4.35.4/include/linux/ppp-comp.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/ppp-comp.h
-+++ linux-2.4.35.4/include/linux/ppp-comp.h
+--- a/include/linux/ppp-comp.h
++++ b/include/linux/ppp-comp.h
@@ -28,7 +28,7 @@
*/
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
@@ -17995,6 +17995,34 @@ CONFIG_UNIXWARE_DISKLABEL
If you don't know what all this is about, say N.
SMB file system support (to mount Windows shares etc.)
CONFIG_SMB_FS
SMB (Server Message Block) is the protocol Windows for Workgroups
-Index: linux-2.4.35.4/Documentation/filesystems/00-INDEX
-===================================================================
---- linux-2.4.35.4.orig/Documentation/filesystems/00-INDEX
-+++ linux-2.4.35.4/Documentation/filesystems/00-INDEX
+--- a/Documentation/filesystems/00-INDEX
++++ b/Documentation/filesystems/00-INDEX
@@ -10,6 +10,8 @@ befs.txt
- info for the BeOS file system (BFS)
bfs.txt
coda.txt
- description of the CODA filesystem.
cramfs.txt
-Index: linux-2.4.35.4/Documentation/filesystems/cifs.txt
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/Documentation/filesystems/cifs.txt
++++ b/Documentation/filesystems/cifs.txt
@@ -0,0 +1,51 @@
+ This is the client VFS module for the Common Internet File System
+ (CIFS) protocol which is the successor to the Server Message Block
+ or the Samba site:
+
+ http://www.samba.org
-Index: linux-2.4.35.4/fs/cifs/asn1.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/asn1.c
++++ b/fs/cifs/asn1.c
@@ -0,0 +1,614 @@
+/*
+ * The ASB.1/BER parsing code is derived from ip_nat_snmp_basic.c which was in
+
+ return 1;
+}
-Index: linux-2.4.35.4/fs/cifs/AUTHORS
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/AUTHORS
++++ b/fs/cifs/AUTHORS
@@ -0,0 +1,37 @@
+Original Author
+===============
+
+And thanks to the IBM LTC and Power test teams and SuSE testers for
+finding multiple bugs during excellent stress test runs.
-Index: linux-2.4.35.4/fs/cifs/CHANGES
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/CHANGES
++++ b/fs/cifs/CHANGES
@@ -0,0 +1,572 @@
+Version 1.20
+------------
+-----------
+Initial drop
+
-Index: linux-2.4.35.4/fs/cifs/cifs_debug.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifs_debug.c
++++ b/fs/cifs/cifs_debug.c
@@ -0,0 +1,797 @@
+/*
+ * fs/cifs_debug.c
+
+
+#endif
-Index: linux-2.4.35.4/fs/cifs/cifs_debug.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifs_debug.h
++++ b/fs/cifs/cifs_debug.h
@@ -0,0 +1,66 @@
+/*
+ *
+#endif /* _CIFS_DEBUG */
+
+#endif /* _H_CIFS_DEBUG */
-Index: linux-2.4.35.4/fs/cifs/cifsencrypt.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifsencrypt.c
++++ b/fs/cifs/cifsencrypt.c
@@ -0,0 +1,204 @@
+/*
+ * fs/cifs/cifsencrypt.c
+
+ hmac_md5_final(v2_session_response,&context);
+}
-Index: linux-2.4.35.4/fs/cifs/cifserr.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifserr.c
++++ b/fs/cifs/cifserr.c
@@ -0,0 +1,70 @@
+/*
+ * fs/cifserr.c
+{
+ return map_cifs_error(error_class, error_code, FALSE);
+}
-Index: linux-2.4.35.4/fs/cifs/cifsfs.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifsfs.c
++++ b/fs/cifs/cifsfs.c
@@ -0,0 +1,769 @@
+/*
+ * fs/cifs/cifsfs.c
+ ("VFS to access servers complying with the SNIA CIFS Specification e.g. Samba and Windows");
+module_init(init_cifs)
+module_exit(exit_cifs)
-Index: linux-2.4.35.4/fs/cifs/cifsfs.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifsfs.h
++++ b/fs/cifs/cifsfs.h
@@ -0,0 +1,97 @@
+/*
+ * fs/cifs/cifsfs.h
+extern ssize_t cifs_listxattr(struct dentry *, char *, size_t);
+#define CIFS_VERSION "1.20"
+#endif /* _CIFSFS_H */
-Index: linux-2.4.35.4/fs/cifs/cifs_fs_sb.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifs_fs_sb.h
++++ b/fs/cifs/cifs_fs_sb.h
@@ -0,0 +1,32 @@
+/*
+ * fs/cifs/cifs_fs_sb.h
+ mode_t mnt_dir_mode;
+};
+#endif /* _CIFS_FS_SB_H */
-Index: linux-2.4.35.4/fs/cifs/cifsglob.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifsglob.h
++++ b/fs/cifs/cifsglob.h
@@ -0,0 +1,413 @@
+/*
+ * fs/cifs/cifsglob.h
+GLOBAL_EXTERN unsigned int sign_CIFS_PDUs; /* enable smb packet signing */
+GLOBAL_EXTERN unsigned int linuxExtEnabled; /* enable Linux/Unix CIFS extensions */
+
-Index: linux-2.4.35.4/fs/cifs/cifspdu.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifspdu.h
++++ b/fs/cifs/cifspdu.h
@@ -0,0 +1,1793 @@
+/*
+ * fs/cifs/cifspdu.h
+#pragma pack() /* resume default structure packing */
+
+#endif /* _CIFSPDU_H */
-Index: linux-2.4.35.4/fs/cifs/cifsproto.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifsproto.h
++++ b/fs/cifs/cifsproto.h
@@ -0,0 +1,254 @@
+/*
+ * fs/cifs/cifsproto.h
+ char * EAData, size_t size,
+ const struct nls_table *nls_codepage);
+#endif /* _CIFSPROTO_H */
-Index: linux-2.4.35.4/fs/cifs/cifssmb.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifssmb.c
++++ b/fs/cifs/cifssmb.c
@@ -0,0 +1,3016 @@
+/*
+ * fs/cifs/cifssmb.c
+ return rc;
+}
+#endif
-Index: linux-2.4.35.4/fs/cifs/cifs_unicode.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifs_unicode.c
++++ b/fs/cifs/cifs_unicode.c
@@ -0,0 +1,87 @@
+/*
+ * fs/cifs/cifs_unicode.c
+ return i;
+}
+
-Index: linux-2.4.35.4/fs/cifs/cifs_unicode.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifs_unicode.h
++++ b/fs/cifs/cifs_unicode.h
@@ -0,0 +1,353 @@
+/*
+ * cifs_unicode: Unicode kernel case support
+}
+
+#endif
-Index: linux-2.4.35.4/fs/cifs/cifs_uniupr.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/cifs_uniupr.h
++++ b/fs/cifs/cifs_uniupr.h
@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) International Business Machines Corp., 2000,2002
+ 0, 0, 0
+};
+#endif
-Index: linux-2.4.35.4/fs/cifs/connect.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/connect.c
++++ b/fs/cifs/connect.c
@@ -0,0 +1,2924 @@
+/*
+ * fs/cifs/connect.c
+ return rc;
+}
+
-Index: linux-2.4.35.4/fs/cifs/dir.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/dir.c
++++ b/fs/cifs/dir.c
@@ -0,0 +1,425 @@
+/*
+ * fs/cifs/dir.c
+/* d_delete: cifs_d_delete, *//* not needed except for debugging */
+ /* no need for d_hash, d_compare, d_release, d_iput ... yet. BB confirm this BB */
+};
-Index: linux-2.4.35.4/fs/cifs/file.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/file.c
++++ b/fs/cifs/file.c
@@ -0,0 +1,2185 @@
+/*
+ * fs/cifs/file.c
+ .sync_page = cifs_sync_page,
+ /*.direct_IO = */
+};
-Index: linux-2.4.35.4/fs/cifs/inode.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/inode.c
++++ b/fs/cifs/inode.c
@@ -0,0 +1,1079 @@
+/*
+ * fs/cifs/inode.c
+ /* may have to add back in if and when safe distributed caching of
+ directories added e.g. via FindNotify */
+}
-Index: linux-2.4.35.4/fs/cifs/link.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/link.c
++++ b/fs/cifs/link.c
@@ -0,0 +1,328 @@
+/*
+ * fs/cifs/link.c
+ FreeXid(xid);
+ return rc;
+}
-Index: linux-2.4.35.4/fs/cifs/Makefile
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/Makefile
++++ b/fs/cifs/Makefile
@@ -0,0 +1,10 @@
+#
+# Makefile for Linux CIFS VFS client
+obj-m := $(O_TARGET)
+
+include $(TOPDIR)/Rules.make
-Index: linux-2.4.35.4/fs/cifs/md4.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/md4.c
++++ b/fs/cifs/md4.c
@@ -0,0 +1,203 @@
+/*
+ Unix SMB/Netbios implementation.
+
+ A = B = C = D = 0;
+}
-Index: linux-2.4.35.4/fs/cifs/md5.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/md5.c
++++ b/fs/cifs/md5.c
@@ -0,0 +1,363 @@
+/*
+ * This code implements the MD5 message-digest algorithm.
+ }
+ hmac_md5_final(digest, &ctx);
+}
-Index: linux-2.4.35.4/fs/cifs/md5.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/md5.h
++++ b/fs/cifs/md5.h
@@ -0,0 +1,38 @@
+#ifndef MD5_H
+#define MD5_H
+void hmac_md5_final(unsigned char *digest, struct HMACMD5Context *ctx);
+void hmac_md5(unsigned char key[16], unsigned char *data, int data_len,
+ unsigned char *digest);
-Index: linux-2.4.35.4/fs/cifs/misc.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/misc.c
++++ b/fs/cifs/misc.c
@@ -0,0 +1,463 @@
+/*
+ * fs/cifs/misc.c
+ printk( " | %s\n", debug_line);
+ return;
+}
-Index: linux-2.4.35.4/fs/cifs/netmisc.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/netmisc.c
++++ b/fs/cifs/netmisc.c
@@ -0,0 +1,905 @@
+/*
+ * fs/cifs/netmisc.c
+ dce_time += NTFS_TIME_OFFSET;
+ return dce_time;
+}
-Index: linux-2.4.35.4/fs/cifs/nterr.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/nterr.c
++++ b/fs/cifs/nterr.c
@@ -0,0 +1,687 @@
+/*
+ * Unix SMB/Netbios implementation.
+ {"STATUS_SOME_UNMAPPED", STATUS_SOME_UNMAPPED},
+ {NULL, 0}
+};
-Index: linux-2.4.35.4/fs/cifs/nterr.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/nterr.h
++++ b/fs/cifs/nterr.h
@@ -0,0 +1,556 @@
+/*
+ Unix SMB/Netbios implementation.
+#define NT_STATUS_NO_SUCH_JOB 0xC0000000 | 0xEDE /* scheduler */
+
+#endif /* _NTERR_H */
-Index: linux-2.4.35.4/fs/cifs/ntlmssp.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/ntlmssp.h
++++ b/fs/cifs/ntlmssp.h
@@ -0,0 +1,101 @@
+/*
+ * fs/cifs/ntlmssp.h
+} AUTHENTICATE_MESSAGE, *PAUTHENTICATE_MESSAGE;
+
+#pragma pack() /* resume default structure packing */
-Index: linux-2.4.35.4/fs/cifs/README
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/README
++++ b/fs/cifs/README
@@ -0,0 +1,356 @@
+The CIFS VFS support for Linux supports many advanced network filesystem
+features such as heirarchical dfs like namespace, hardlinks, locking and more.
+Windows 2000 server or Samba since it does not usually send "raw NTLMSSP"
+(instead it sends NTLMSSP encapsulated in SPNEGO/GSSAPI, which support is not
+complete in the CIFS VFS yet).
-Index: linux-2.4.35.4/fs/cifs/rfc1002pdu.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/rfc1002pdu.h
++++ b/fs/cifs/rfc1002pdu.h
@@ -0,0 +1,79 @@
+/*
+ * fs/cifs/rfc1002pdu.h
+
+#pragma pack() /* resume default structure packing */
+
-Index: linux-2.4.35.4/fs/cifs/smbdes.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/smbdes.c
++++ b/fs/cifs/smbdes.c
@@ -0,0 +1,408 @@
+/*
+ Unix SMB/Netbios implementation.
+ key2[0] = key[7];
+ smbhash(out + 8, in + 8, key2, forw);
+}
-Index: linux-2.4.35.4/fs/cifs/smbencrypt.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/smbencrypt.c
++++ b/fs/cifs/smbencrypt.c
@@ -0,0 +1,295 @@
+/*
+ Unix SMB/Netbios implementation.
+{
+ mdfour((unsigned char *) sess_key, (unsigned char *) kr, 16);
+}
-Index: linux-2.4.35.4/fs/cifs/smberr.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/smberr.c
++++ b/fs/cifs/smberr.c
@@ -0,0 +1,240 @@
+/*
+ Unix SMB/Netbios implementation.
+ NTSTATUS status = map_nt_error_from_unix(error);
+ return ntstatus_to_werror(status);
+}
-Index: linux-2.4.35.4/fs/cifs/smberr.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/smberr.h
++++ b/fs/cifs/smberr.h
@@ -0,0 +1,113 @@
+/*
+ * fs/cifs/smberr.h
+#define ERRpasswordExpired 2242
+#define ERRnetlogonNotStarted 2455
+#define ERRnosupport 0xFFFF
-Index: linux-2.4.35.4/fs/cifs/TODO
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/TODO
++++ b/fs/cifs/TODO
@@ -0,0 +1,106 @@
+version 1.16 May 27, 2004
+
+4) More exhaustively test the recently added NT4 support against various
+NT4 service pack levels.
+
-Index: linux-2.4.35.4/fs/cifs/transport.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/cifs/transport.c
++++ b/fs/cifs/transport.c
@@ -0,0 +1,434 @@
+/*
+ * fs/cifs/transport.c
+
+ return rc;
+}
-Index: linux-2.4.35.4/fs/Config.in
-===================================================================
---- linux-2.4.35.4.orig/fs/Config.in
-+++ linux-2.4.35.4/fs/Config.in
+--- a/fs/Config.in
++++ b/fs/Config.in
@@ -153,6 +153,10 @@ if [ "$CONFIG_NET" = "y" ]; then
define_bool CONFIG_LOCKD_V4 y
fi
dep_tristate 'SMB file system support (to mount Windows shares etc.)' CONFIG_SMB_FS $CONFIG_INET
if [ "$CONFIG_SMB_FS" != "n" ]; then
bool ' Use a default NLS' CONFIG_SMB_NLS_DEFAULT
-Index: linux-2.4.35.4/fs/Makefile
-===================================================================
---- linux-2.4.35.4.orig/fs/Makefile
-+++ linux-2.4.35.4/fs/Makefile
+--- a/fs/Makefile
++++ b/fs/Makefile
@@ -37,6 +37,7 @@ subdir-$(CONFIG_MSDOS_FS) += msdos
subdir-$(CONFIG_VFAT_FS) += vfat
subdir-$(CONFIG_BFS_FS) += bfs
subdir-$(CONFIG_DEVFS_FS) += devfs
subdir-$(CONFIG_HFSPLUS_FS) += hfsplus # Before hfs to find wrapped HFS+
subdir-$(CONFIG_HFS_FS) += hfs
-Index: linux-2.4.35.4/fs/nls/Config.in
-===================================================================
---- linux-2.4.35.4.orig/fs/nls/Config.in
-+++ linux-2.4.35.4/fs/nls/Config.in
+--- a/fs/nls/Config.in
++++ b/fs/nls/Config.in
@@ -11,6 +11,7 @@ fi
# msdos and Joliet want NLS
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
@@ -4690,6 +4690,12 @@ CONFIG_BINFMT_ELF
ld.so (check the file <file:Documentation/Changes> for location and
latest version).
OSF/1 v4 readv/writev compatibility
CONFIG_OSF4_COMPAT
-Index: linux-2.4.35.4/arch/alpha/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/alpha/config.in
-+++ linux-2.4.35.4/arch/alpha/config.in
+--- a/arch/alpha/config.in
++++ b/arch/alpha/config.in
@@ -315,6 +315,9 @@ if [ "$CONFIG_BINFMT_AOUT" != "n" ]; the
fi
tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
tristate 'Kernel support for Linux/Intel ELF binaries' CONFIG_BINFMT_EM86
source drivers/parport/Config.in
-Index: linux-2.4.35.4/arch/alpha/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/alpha/defconfig
-+++ linux-2.4.35.4/arch/alpha/defconfig
+--- a/arch/alpha/defconfig
++++ b/arch/alpha/defconfig
@@ -72,6 +72,7 @@ CONFIG_KCORE_ELF=y
# CONFIG_KCORE_AOUT is not set
# CONFIG_BINFMT_AOUT is not set
# CONFIG_BINFMT_MISC is not set
# CONFIG_BINFMT_EM86 is not set
-Index: linux-2.4.35.4/arch/arm/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/arm/config.in
-+++ linux-2.4.35.4/arch/arm/config.in
+--- a/arch/arm/config.in
++++ b/arch/arm/config.in
@@ -499,6 +499,9 @@ choice 'Kernel core (/proc/kcore) format
A.OUT CONFIG_KCORE_AOUT" ELF
tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
dep_bool 'Power Management support (experimental)' CONFIG_PM $CONFIG_EXPERIMENTAL
dep_tristate 'RISC OS personality' CONFIG_ARTHUR $CONFIG_CPU_32
-Index: linux-2.4.35.4/arch/arm/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/arm/defconfig
-+++ linux-2.4.35.4/arch/arm/defconfig
+--- a/arch/arm/defconfig
++++ b/arch/arm/defconfig
@@ -83,8 +83,9 @@ CONFIG_SYSCTL=y
CONFIG_NWFPE=y
CONFIG_KCORE_ELF=y
# CONFIG_BINFMT_MISC is not set
# CONFIG_PM is not set
# CONFIG_ARTHUR is not set
-Index: linux-2.4.35.4/arch/cris/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/cris/config.in
-+++ linux-2.4.35.4/arch/cris/config.in
+--- a/arch/cris/config.in
++++ b/arch/cris/config.in
@@ -31,6 +31,9 @@ bool 'BSD Process Accounting' CONFIG_BSD
bool 'Sysctl support' CONFIG_SYSCTL
string 'Kernel command line' CONFIG_ETRAX_CMDLINE "root=/dev/mtdblock3"
-Index: linux-2.4.35.4/arch/cris/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/cris/defconfig
-+++ linux-2.4.35.4/arch/cris/defconfig
+--- a/arch/cris/defconfig
++++ b/arch/cris/defconfig
@@ -18,6 +18,7 @@ CONFIG_SYSVIPC=y
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_SYSCTL is not set
# CONFIG_ETRAX_KGDB is not set
# CONFIG_ETRAX_WATCHDOG is not set
-Index: linux-2.4.35.4/arch/i386/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/i386/config.in
-+++ linux-2.4.35.4/arch/i386/config.in
+--- a/arch/i386/config.in
++++ b/arch/i386/config.in
@@ -329,6 +329,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
fi
tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER
-Index: linux-2.4.35.4/arch/i386/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/i386/defconfig
-+++ linux-2.4.35.4/arch/i386/defconfig
+--- a/arch/i386/defconfig
++++ b/arch/i386/defconfig
@@ -115,9 +115,10 @@ CONFIG_SYSVIPC=y
CONFIG_SYSCTL=y
CONFIG_KCORE_ELF=y
# CONFIG_OOM_KILLER is not set
CONFIG_PM=y
# CONFIG_APM is not set
-Index: linux-2.4.35.4/arch/ia64/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/ia64/config.in
-+++ linux-2.4.35.4/arch/ia64/config.in
+--- a/arch/ia64/config.in
++++ b/arch/ia64/config.in
@@ -124,6 +124,9 @@ bool 'System V IPC' CONFIG_SYSVIPC
bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
bool 'Sysctl support' CONFIG_SYSCTL
tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
-Index: linux-2.4.35.4/arch/ia64/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/ia64/defconfig
-+++ linux-2.4.35.4/arch/ia64/defconfig
+--- a/arch/ia64/defconfig
++++ b/arch/ia64/defconfig
@@ -60,6 +60,7 @@ CONFIG_SYSVIPC=y
# CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_SYSCTL=y
# CONFIG_BINFMT_MISC is not set
CONFIG_ACPI=y
CONFIG_ACPI_EFI=y
-Index: linux-2.4.35.4/arch/m68k/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/m68k/config.in
-+++ linux-2.4.35.4/arch/m68k/config.in
+--- a/arch/m68k/config.in
++++ b/arch/m68k/config.in
@@ -99,6 +99,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
fi
tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
if [ "$CONFIG_AMIGA" = "y" ]; then
-Index: linux-2.4.35.4/arch/m68k/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/m68k/defconfig
-+++ linux-2.4.35.4/arch/m68k/defconfig
+--- a/arch/m68k/defconfig
++++ b/arch/m68k/defconfig
@@ -44,8 +44,9 @@ CONFIG_SYSVIPC=y
CONFIG_SYSCTL=y
CONFIG_KCORE_ELF=y
# CONFIG_BINFMT_MISC is not set
CONFIG_ZORRO=y
# CONFIG_AMIGA_PCMCIA is not set
-Index: linux-2.4.35.4/arch/mips/config-shared.in
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/config-shared.in
-+++ linux-2.4.35.4/arch/mips/config-shared.in
+--- a/arch/mips/config-shared.in
++++ b/arch/mips/config-shared.in
@@ -873,6 +873,9 @@ define_bool CONFIG_KCORE_ELF y
define_bool CONFIG_KCORE_AOUT n
define_bool CONFIG_BINFMT_AOUT n
dep_bool 'Kernel support for Linux/MIPS 32-bit binary compatibility' CONFIG_MIPS32_COMPAT $CONFIG_MIPS64
dep_bool 'Kernel support for o32 binaries' CONFIG_MIPS32_O32 $CONFIG_MIPS32_COMPAT
dep_bool 'Kernel support for n32 binaries' CONFIG_MIPS32_N32 $CONFIG_MIPS32_COMPAT
-Index: linux-2.4.35.4/arch/mips/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/defconfig
-+++ linux-2.4.35.4/arch/mips/defconfig
+--- a/arch/mips/defconfig
++++ b/arch/mips/defconfig
@@ -143,6 +143,7 @@ CONFIG_KCORE_ELF=y
# CONFIG_KCORE_AOUT is not set
# CONFIG_BINFMT_AOUT is not set
# CONFIG_MIPS32_COMPAT is not set
# CONFIG_MIPS32_O32 is not set
# CONFIG_MIPS32_N32 is not set
-Index: linux-2.4.35.4/arch/mips/kernel/irixelf.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/irixelf.c
-+++ linux-2.4.35.4/arch/mips/kernel/irixelf.c
+--- a/arch/mips/kernel/irixelf.c
++++ b/arch/mips/kernel/irixelf.c
@@ -8,6 +8,7 @@
* Copyright 1993, 1994: Eric Youngdale (ericy@cais.com).
*/
/* Called through irix_syssgi() to map an elf image given an FD,
* a phdr ptr USER_PHDRP in userspace, and a count CNT telling how many
-Index: linux-2.4.35.4/arch/mips64/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/defconfig
-+++ linux-2.4.35.4/arch/mips64/defconfig
+--- a/arch/mips64/defconfig
++++ b/arch/mips64/defconfig
@@ -147,6 +147,7 @@ CONFIG_KCORE_ELF=y
# CONFIG_KCORE_AOUT is not set
# CONFIG_BINFMT_AOUT is not set
CONFIG_MIPS32_COMPAT=y
CONFIG_MIPS32_O32=y
# CONFIG_MIPS32_N32 is not set
-Index: linux-2.4.35.4/arch/parisc/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/parisc/config.in
-+++ linux-2.4.35.4/arch/parisc/config.in
+--- a/arch/parisc/config.in
++++ b/arch/parisc/config.in
@@ -89,6 +89,9 @@ bool 'BSD Process Accounting' CONFIG_BSD
bool 'Sysctl support' CONFIG_SYSCTL
define_bool CONFIG_KCORE_ELF y
tristate 'Kernel support for SOM binaries' CONFIG_BINFMT_SOM
tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
-Index: linux-2.4.35.4/arch/parisc/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/parisc/defconfig
-+++ linux-2.4.35.4/arch/parisc/defconfig
+--- a/arch/parisc/defconfig
++++ b/arch/parisc/defconfig
@@ -56,6 +56,7 @@ CONFIG_SYSVIPC=y
CONFIG_SYSCTL=y
CONFIG_KCORE_ELF=y
CONFIG_BINFMT_SOM=y
# CONFIG_BINFMT_MISC is not set
# CONFIG_PM is not set
-Index: linux-2.4.35.4/arch/ppc/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/ppc/config.in
-+++ linux-2.4.35.4/arch/ppc/config.in
+--- a/arch/ppc/config.in
++++ b/arch/ppc/config.in
@@ -384,6 +384,7 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
fi
define_bool CONFIG_BINFMT_ELF y
tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER
-Index: linux-2.4.35.4/arch/ppc/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/ppc/defconfig
-+++ linux-2.4.35.4/arch/ppc/defconfig
+--- a/arch/ppc/defconfig
++++ b/arch/ppc/defconfig
@@ -59,7 +59,8 @@ CONFIG_SYSVIPC=y
CONFIG_KCORE_ELF=y
CONFIG_BINFMT_ELF=y
# CONFIG_OOM_KILLER is not set
CONFIG_PCI_NAMES=y
CONFIG_HOTPLUG=y
-Index: linux-2.4.35.4/arch/ppc64/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/ppc64/config.in
-+++ linux-2.4.35.4/arch/ppc64/config.in
+--- a/arch/ppc64/config.in
++++ b/arch/ppc64/config.in
@@ -82,6 +82,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
fi
tristate 'Kernel support for 32 bit ELF binaries' CONFIG_BINFMT_ELF32
-Index: linux-2.4.35.4/arch/ppc64/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/ppc64/defconfig
-+++ linux-2.4.35.4/arch/ppc64/defconfig
+--- a/arch/ppc64/defconfig
++++ b/arch/ppc64/defconfig
@@ -56,6 +56,7 @@ CONFIG_SYSVIPC=y
# CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_KCORE_ELF=y
CONFIG_BINFMT_ELF32=y
# CONFIG_BINFMT_MISC is not set
CONFIG_PCI_NAMES=y
-Index: linux-2.4.35.4/arch/s390/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/s390/config.in
-+++ linux-2.4.35.4/arch/s390/config.in
+--- a/arch/s390/config.in
++++ b/arch/s390/config.in
@@ -58,6 +58,9 @@ bool 'BSD Process Accounting' CONFIG_BSD
bool 'Sysctl support' CONFIG_SYSCTL
define_bool CONFIG_KCORE_ELF y
tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
bool 'Show crashed user process info' CONFIG_PROCESS_DEBUG
bool 'Pseudo page fault support' CONFIG_PFAULT
-Index: linux-2.4.35.4/arch/s390/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/s390/defconfig
-+++ linux-2.4.35.4/arch/s390/defconfig
+--- a/arch/s390/defconfig
++++ b/arch/s390/defconfig
@@ -46,6 +46,7 @@ CONFIG_SYSVIPC=y
CONFIG_SYSCTL=y
CONFIG_KCORE_ELF=y
# CONFIG_BINFMT_MISC is not set
# CONFIG_PROCESS_DEBUG is not set
CONFIG_PFAULT=y
-Index: linux-2.4.35.4/arch/s390x/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/s390x/config.in
-+++ linux-2.4.35.4/arch/s390x/config.in
+--- a/arch/s390x/config.in
++++ b/arch/s390x/config.in
@@ -61,6 +61,9 @@ bool 'BSD Process Accounting' CONFIG_BSD
bool 'Sysctl support' CONFIG_SYSCTL
define_bool CONFIG_KCORE_ELF y
tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
bool 'Show crashed user process info' CONFIG_PROCESS_DEBUG
bool 'Pseudo page fault support' CONFIG_PFAULT
-Index: linux-2.4.35.4/arch/s390x/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/s390x/defconfig
-+++ linux-2.4.35.4/arch/s390x/defconfig
+--- a/arch/s390x/defconfig
++++ b/arch/s390x/defconfig
@@ -47,6 +47,7 @@ CONFIG_SYSVIPC=y
CONFIG_SYSCTL=y
CONFIG_KCORE_ELF=y
# CONFIG_BINFMT_MISC is not set
# CONFIG_PROCESS_DEBUG is not set
CONFIG_PFAULT=y
-Index: linux-2.4.35.4/arch/sh/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/sh/config.in
-+++ linux-2.4.35.4/arch/sh/config.in
+--- a/arch/sh/config.in
++++ b/arch/sh/config.in
@@ -283,6 +283,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
A.OUT CONFIG_KCORE_AOUT" ELF
fi
tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER
-Index: linux-2.4.35.4/arch/sh/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/sh/defconfig
-+++ linux-2.4.35.4/arch/sh/defconfig
+--- a/arch/sh/defconfig
++++ b/arch/sh/defconfig
@@ -48,6 +48,7 @@ CONFIG_CF_ENABLER=y
CONFIG_KCORE_ELF=y
# CONFIG_KCORE_AOUT is not set
# CONFIG_BINFMT_MISC is not set
#
-Index: linux-2.4.35.4/arch/sparc/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/sparc/config.in
-+++ linux-2.4.35.4/arch/sparc/config.in
+--- a/arch/sparc/config.in
++++ b/arch/sparc/config.in
@@ -74,6 +74,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
fi
tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
bool 'SunOS binary emulation' CONFIG_SUNOS_EMUL
bool 'Select task to kill on out of memory condition' CONFIG_OOM_KILLER
-Index: linux-2.4.35.4/arch/sparc/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/sparc/defconfig
-+++ linux-2.4.35.4/arch/sparc/defconfig
+--- a/arch/sparc/defconfig
++++ b/arch/sparc/defconfig
@@ -49,9 +49,10 @@ CONFIG_SYSVIPC=y
# CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_SYSCTL=y
CONFIG_SUNOS_EMUL=y
# CONFIG_OOM_KILLER is not set
-Index: linux-2.4.35.4/arch/sparc64/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/sparc64/config.in
-+++ linux-2.4.35.4/arch/sparc64/config.in
+--- a/arch/sparc64/config.in
++++ b/arch/sparc64/config.in
@@ -79,6 +79,9 @@ if [ "$CONFIG_SPARC32_COMPAT" != "n" ];
bool ' Kernel support for 32-bit (ie. SunOS) a.out binaries' CONFIG_BINFMT_AOUT32
fi
tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
bool 'SunOS binary emulation' CONFIG_SUNOS_EMUL
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-Index: linux-2.4.35.4/arch/sparc64/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/sparc64/defconfig
-+++ linux-2.4.35.4/arch/sparc64/defconfig
+--- a/arch/sparc64/defconfig
++++ b/arch/sparc64/defconfig
@@ -70,7 +70,8 @@ CONFIG_SPARC32_COMPAT=y
CONFIG_BINFMT_ELF32=y
# CONFIG_BINFMT_AOUT32 is not set
# CONFIG_SUNOS_EMUL is not set
CONFIG_SOLARIS_EMUL=m
# CONFIG_OOM_KILLER is not set
-Index: linux-2.4.35.4/arch/x86_64/config.in
-===================================================================
---- linux-2.4.35.4.orig/arch/x86_64/config.in
-+++ linux-2.4.35.4/arch/x86_64/config.in
+--- a/arch/x86_64/config.in
++++ b/arch/x86_64/config.in
@@ -118,6 +118,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then
fi
#tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT
tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
bool 'Power Management support' CONFIG_PM
-Index: linux-2.4.35.4/arch/x86_64/defconfig
-===================================================================
---- linux-2.4.35.4.orig/arch/x86_64/defconfig
-+++ linux-2.4.35.4/arch/x86_64/defconfig
+--- a/arch/x86_64/defconfig
++++ b/arch/x86_64/defconfig
@@ -67,6 +67,7 @@ CONFIG_SYSVIPC=y
CONFIG_SYSCTL=y
CONFIG_KCORE_ELF=y
# CONFIG_BINFMT_MISC is not set
CONFIG_PM=y
CONFIG_IA32_EMULATION=y
-Index: linux-2.4.35.4/fs/binfmt_elf.c
-===================================================================
---- linux-2.4.35.4.orig/fs/binfmt_elf.c
-+++ linux-2.4.35.4/fs/binfmt_elf.c
+--- a/fs/binfmt_elf.c
++++ b/fs/binfmt_elf.c
@@ -9,6 +9,7 @@
* Copyright 1993, 1994: Eric Youngdale (ericy@cais.com).
*/
/*
* Note that some platforms still use traditional core dumps and not
-Index: linux-2.4.35.4/fs/exec.c
-===================================================================
---- linux-2.4.35.4.orig/fs/exec.c
-+++ linux-2.4.35.4/fs/exec.c
+--- a/fs/exec.c
++++ b/fs/exec.c
@@ -109,6 +109,7 @@ static inline void put_binfmt(struct lin
*/
asmlinkage long sys_uselib(const char * library)
packaging/utils/nattpatch 2.4
-Index: linux-2.4.35.4/include/net/sock.h
-===================================================================
---- linux-2.4.35.4.orig/include/net/sock.h
-+++ linux-2.4.35.4/include/net/sock.h
+--- a/include/net/sock.h
++++ b/include/net/sock.h
@@ -488,7 +488,13 @@ struct tcp_opt {
} bictcp;
};
} tp_pinfo;
-Index: linux-2.4.35.4/net/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/Config.in
-+++ linux-2.4.35.4/net/Config.in
+--- a/net/Config.in
++++ b/net/Config.in
@@ -104,4 +104,6 @@ comment 'Network testing'
dep_tristate 'Packet Generator (USE WITH CAUTION)' CONFIG_NET_PKTGEN $CONFIG_PROC_FS
endmenu
+bool 'IPSEC NAT-Traversal' CONFIG_IPSEC_NAT_TRAVERSAL
+
endmenu
-Index: linux-2.4.35.4/net/ipv4/udp.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/udp.c
-+++ linux-2.4.35.4/net/ipv4/udp.c
+--- a/net/ipv4/udp.c
++++ b/net/ipv4/udp.c
@@ -860,6 +860,9 @@ static void udp_close(struct sock *sk, l
static int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
@@ -10675,6 +10675,20 @@ CONFIG_TUN
If you don't know what to use this for, you don't need it.
Ethertap network tap (OBSOLETE)
CONFIG_ETHERTAP
If you say Y here (and have said Y to "Kernel/User network link
-Index: linux-2.4.35.4/drivers/net/Config.in
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/Config.in
-+++ linux-2.4.35.4/drivers/net/Config.in
+--- a/drivers/net/Config.in
++++ b/drivers/net/Config.in
@@ -8,6 +8,7 @@ tristate 'Dummy net driver support' CONF
tristate 'Bonding driver support' CONFIG_BONDING
tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
tristate 'Ethertap network tap (OBSOLETE)' CONFIG_ETHERTAP
fi
-Index: linux-2.4.35.4/include/asm-alpha/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-alpha/signal.h
-+++ linux-2.4.35.4/include/asm-alpha/signal.h
+--- a/include/asm-alpha/signal.h
++++ b/include/asm-alpha/signal.h
@@ -121,8 +121,15 @@ typedef unsigned long sigset_t;
#define SA_PROBE SA_ONESHOT
#define SA_SAMPLE_RANDOM SA_RESTART
#define SIG_BLOCK 1 /* for blocking signals */
#define SIG_UNBLOCK 2 /* for unblocking signals */
#define SIG_SETMASK 3 /* for setting the signal mask */
-Index: linux-2.4.35.4/include/asm-arm/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-arm/signal.h
-+++ linux-2.4.35.4/include/asm-arm/signal.h
+--- a/include/asm-arm/signal.h
++++ b/include/asm-arm/signal.h
@@ -125,8 +125,15 @@ typedef unsigned long sigset_t;
#define SA_PROBE 0x80000000
#define SA_SAMPLE_RANDOM 0x10000000
#define SIG_BLOCK 0 /* for blocking signals */
#define SIG_UNBLOCK 1 /* for unblocking signals */
#define SIG_SETMASK 2 /* for setting the signal mask */
-Index: linux-2.4.35.4/include/asm-cris/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-cris/signal.h
-+++ linux-2.4.35.4/include/asm-cris/signal.h
+--- a/include/asm-cris/signal.h
++++ b/include/asm-cris/signal.h
@@ -120,8 +120,15 @@ typedef unsigned long sigset_t;
#define SA_PROBE SA_ONESHOT
#define SA_SAMPLE_RANDOM SA_RESTART
#define SIG_BLOCK 0 /* for blocking signals */
#define SIG_UNBLOCK 1 /* for unblocking signals */
#define SIG_SETMASK 2 /* for setting the signal mask */
-Index: linux-2.4.35.4/include/asm-i386/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-i386/signal.h
-+++ linux-2.4.35.4/include/asm-i386/signal.h
+--- a/include/asm-i386/signal.h
++++ b/include/asm-i386/signal.h
@@ -119,8 +119,15 @@ typedef unsigned long sigset_t;
#define SA_PROBE SA_ONESHOT
#define SA_SAMPLE_RANDOM SA_RESTART
#define SIG_BLOCK 0 /* for blocking signals */
#define SIG_UNBLOCK 1 /* for unblocking signals */
#define SIG_SETMASK 2 /* for setting the signal mask */
-Index: linux-2.4.35.4/include/asm-ia64/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-ia64/signal.h
-+++ linux-2.4.35.4/include/asm-ia64/signal.h
+--- a/include/asm-ia64/signal.h
++++ b/include/asm-ia64/signal.h
@@ -117,6 +117,12 @@
#define SA_SHIRQ 0x04000000
#define SA_PERCPU_IRQ 0x02000000
#endif /* __KERNEL__ */
#define SIG_BLOCK 0 /* for blocking signals */
-Index: linux-2.4.35.4/include/asm-m68k/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-m68k/signal.h
-+++ linux-2.4.35.4/include/asm-m68k/signal.h
+--- a/include/asm-m68k/signal.h
++++ b/include/asm-m68k/signal.h
@@ -116,8 +116,15 @@ typedef unsigned long sigset_t;
#define SA_PROBE SA_ONESHOT
#define SA_SAMPLE_RANDOM SA_RESTART
#define SIG_BLOCK 0 /* for blocking signals */
#define SIG_UNBLOCK 1 /* for unblocking signals */
#define SIG_SETMASK 2 /* for setting the signal mask */
-Index: linux-2.4.35.4/include/asm-mips/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/signal.h
-+++ linux-2.4.35.4/include/asm-mips/signal.h
+--- a/include/asm-mips/signal.h
++++ b/include/asm-mips/signal.h
@@ -111,6 +111,12 @@ typedef unsigned long old_sigset_t; /*
#define SA_SAMPLE_RANDOM SA_RESTART
#define SA_SHIRQ 0x02000000
#endif /* __KERNEL__ */
#define SIG_BLOCK 1 /* for blocking signals */
-Index: linux-2.4.35.4/include/asm-mips64/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips64/signal.h
-+++ linux-2.4.35.4/include/asm-mips64/signal.h
+--- a/include/asm-mips64/signal.h
++++ b/include/asm-mips64/signal.h
@@ -119,6 +119,12 @@ typedef unsigned int old_sigset_t32;
#define SA_SAMPLE_RANDOM SA_RESTART
#define SA_SHIRQ 0x02000000
#endif /* __KERNEL__ */
#define SIG_BLOCK 1 /* for blocking signals */
-Index: linux-2.4.35.4/include/asm-parisc/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-parisc/signal.h
-+++ linux-2.4.35.4/include/asm-parisc/signal.h
+--- a/include/asm-parisc/signal.h
++++ b/include/asm-parisc/signal.h
@@ -100,6 +100,12 @@
#define SA_SAMPLE_RANDOM SA_RESTART
#define SA_SHIRQ 0x04000000
#endif /* __KERNEL__ */
#define SIG_BLOCK 0 /* for blocking signals */
-Index: linux-2.4.35.4/include/asm-ppc/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-ppc/signal.h
-+++ linux-2.4.35.4/include/asm-ppc/signal.h
+--- a/include/asm-ppc/signal.h
++++ b/include/asm-ppc/signal.h
@@ -111,6 +111,13 @@ typedef struct {
#define SA_PROBE SA_ONESHOT
#define SA_SAMPLE_RANDOM SA_RESTART
#endif /* __KERNEL__ */
#define SIG_BLOCK 0 /* for blocking signals */
-Index: linux-2.4.35.4/include/asm-s390/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-s390/signal.h
-+++ linux-2.4.35.4/include/asm-s390/signal.h
+--- a/include/asm-s390/signal.h
++++ b/include/asm-s390/signal.h
@@ -129,8 +129,15 @@ typedef unsigned long sigset_t;
#define SA_SHIRQ 0x04000000
#define SA_DOPATHGROUP 0x00100000
#define SIG_BLOCK 0 /* for blocking signals */
#define SIG_UNBLOCK 1 /* for unblocking signals */
#define SIG_SETMASK 2 /* for setting the signal mask */
-Index: linux-2.4.35.4/include/asm-s390x/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-s390x/signal.h
-+++ linux-2.4.35.4/include/asm-s390x/signal.h
+--- a/include/asm-s390x/signal.h
++++ b/include/asm-s390x/signal.h
@@ -129,8 +129,15 @@ typedef unsigned long sigset_t;
#define SA_SHIRQ 0x04000000
#define SA_DOPATHGROUP 0x00100000
#define SIG_BLOCK 0 /* for blocking signals */
#define SIG_UNBLOCK 1 /* for unblocking signals */
#define SIG_SETMASK 2 /* for setting the signal mask */
-Index: linux-2.4.35.4/include/asm-sh/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-sh/signal.h
-+++ linux-2.4.35.4/include/asm-sh/signal.h
+--- a/include/asm-sh/signal.h
++++ b/include/asm-sh/signal.h
@@ -107,8 +107,15 @@ typedef struct {
#define SA_PROBE SA_ONESHOT
#define SA_SAMPLE_RANDOM SA_RESTART
#define SIG_BLOCK 0 /* for blocking signals */
#define SIG_UNBLOCK 1 /* for unblocking signals */
#define SIG_SETMASK 2 /* for setting the signal mask */
-Index: linux-2.4.35.4/include/asm-sparc/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-sparc/signal.h
-+++ linux-2.4.35.4/include/asm-sparc/signal.h
+--- a/include/asm-sparc/signal.h
++++ b/include/asm-sparc/signal.h
@@ -176,8 +176,15 @@ struct sigstack {
#define SA_PROBE SA_ONESHOT
#define SA_SAMPLE_RANDOM SA_RESTART
/* Type of a signal handler. */
#ifdef __KERNEL__
typedef void (*__sighandler_t)(int, int, struct sigcontext *, char *);
-Index: linux-2.4.35.4/include/asm-sparc64/signal.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-sparc64/signal.h
-+++ linux-2.4.35.4/include/asm-sparc64/signal.h
+--- a/include/asm-sparc64/signal.h
++++ b/include/asm-sparc64/signal.h
@@ -192,8 +192,15 @@ struct sigstack {
#define SA_PROBE SA_ONESHOT
#define SA_SAMPLE_RANDOM SA_RESTART
-Index: linux-2.4.35.4/net/core/dev.c
-===================================================================
---- linux-2.4.35.4.orig/net/core/dev.c
-+++ linux-2.4.35.4/net/core/dev.c
+--- a/net/core/dev.c
++++ b/net/core/dev.c
@@ -1289,6 +1289,19 @@ int netif_rx(struct sk_buff *skb)
local_irq_save(flags);
-Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/mips_ksyms.c
-+++ linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
+--- a/arch/mips/kernel/mips_ksyms.c
++++ b/arch/mips/kernel/mips_ksyms.c
@@ -30,6 +30,10 @@
#include <asm/floppy.h>
#endif
/* Networking helper routines. */
EXPORT_SYMBOL(csum_partial_copy);
-Index: linux-2.4.35.4/arch/mips/lib/Makefile
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/lib/Makefile
-+++ linux-2.4.35.4/arch/mips/lib/Makefile
+--- a/arch/mips/lib/Makefile
++++ b/arch/mips/lib/Makefile
@@ -9,7 +9,8 @@ L_TARGET = lib.a
obj-y += csum_partial.o csum_partial_copy.o \
promlib.o rtc-std.o rtc-no.o memcpy.o \
export-objs := rtc-std.o rtc-no.o
-Index: linux-2.4.35.4/arch/mips/lib/ashldi3.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/lib/ashldi3.c
++++ b/arch/mips/lib/ashldi3.c
@@ -0,0 +1,62 @@
+/* ashrdi3.c extracted from gcc-2.95.2/libgcc2.c which is: */
+/* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc.
+
+ return w.ll;
+}
-Index: linux-2.4.35.4/arch/mips/lib/ashrdi3.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/lib/ashrdi3.c
++++ b/arch/mips/lib/ashrdi3.c
@@ -0,0 +1,63 @@
+/* ashrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */
+/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+
+ return w.ll;
+}
-Index: linux-2.4.35.4/arch/mips/lib/lshrdi3.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/lib/lshrdi3.c
++++ b/arch/mips/lib/lshrdi3.c
@@ -0,0 +1,62 @@
+/* lshrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: */
+/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+
+ return w.ll;
+}
-Index: linux-2.4.35.4/arch/mips/lib/muldi3.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/arch/mips/lib/muldi3.c
++++ b/arch/mips/lib/muldi3.c
@@ -0,0 +1,63 @@
+/* muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and
+ gcc-2.7.2.3/longlong.h which is: */
+
+ return w.ll;
+}
-Index: linux-2.4.35.4/fs/cifs/cifsfs.c
-===================================================================
---- linux-2.4.35.4.orig/fs/cifs/cifsfs.c
-+++ linux-2.4.35.4/fs/cifs/cifsfs.c
+--- a/fs/cifs/cifsfs.c
++++ b/fs/cifs/cifsfs.c
@@ -50,8 +50,6 @@
static struct quotactl_ops cifs_quotactl_ops;
#endif
int cifsFYI = 0;
int cifsERROR = 1;
int traceSMB = 0;
-Index: linux-2.4.35.4/include/asm-mips/uaccess.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/uaccess.h
-+++ linux-2.4.35.4/include/asm-mips/uaccess.h
+--- a/include/asm-mips/uaccess.h
++++ b/include/asm-mips/uaccess.h
@@ -149,7 +149,7 @@ static inline int verify_area(int type,
* Returns zero on success, or -EFAULT on error.
*/
-Index: linux-2.4.35.4/arch/mips/kernel/time.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/time.c
-+++ linux-2.4.35.4/arch/mips/kernel/time.c
+--- a/arch/mips/kernel/time.c
++++ b/arch/mips/kernel/time.c
@@ -151,6 +151,27 @@ void (*mips_timer_ack)(void);
unsigned int (*mips_hpt_read)(void);
void (*mips_hpt_init)(unsigned int);
EXPORT_SYMBOL(rtc_get_time);
+EXPORT_SYMBOL(get_htscl);
+EXPORT_SYMBOL(get_tscll);
-Index: linux-2.4.35.4/include/asm-mips/timex.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/timex.h
-+++ linux-2.4.35.4/include/asm-mips/timex.h
+--- a/include/asm-mips/timex.h
++++ b/include/asm-mips/timex.h
@@ -31,6 +31,19 @@ static inline cycles_t get_cycles (void)
return read_c0_count();
}
#define vxtime_lock() do {} while (0)
#define vxtime_unlock() do {} while (0)
-Index: linux-2.4.35.4/include/net/pkt_sched.h
-===================================================================
---- linux-2.4.35.4.orig/include/net/pkt_sched.h
-+++ linux-2.4.35.4/include/net/pkt_sched.h
+--- a/include/net/pkt_sched.h
++++ b/include/net/pkt_sched.h
@@ -5,7 +5,11 @@
#define PSCHED_JIFFIES 2
#define PSCHED_CPU 3
-Index: linux-2.4.35.4/arch/mips/kernel/branch.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/branch.c
-+++ linux-2.4.35.4/arch/mips/kernel/branch.c
+--- a/arch/mips/kernel/branch.c
++++ b/arch/mips/kernel/branch.c
@@ -170,7 +170,7 @@ int __compute_return_epc(struct pt_regs
bit = (insn.i_format.rt >> 2);
bit += (bit != 0);
-Index: linux-2.4.35.4/include/linux/sockios.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/sockios.h
-+++ linux-2.4.35.4/include/linux/sockios.h
+--- a/include/linux/sockios.h
++++ b/include/linux/sockios.h
@@ -68,6 +68,11 @@
#define SIOCGIFBR 0x8940 /* Bridging support */
-Index: linux-2.4.35.4/Documentation/isdn/CREDITS
-===================================================================
---- linux-2.4.35.4.orig/Documentation/isdn/CREDITS
-+++ linux-2.4.35.4/Documentation/isdn/CREDITS
+--- a/Documentation/isdn/CREDITS
++++ b/Documentation/isdn/CREDITS
@@ -37,7 +37,7 @@ Michael Knigge (knick@cove.han.de)
Andreas Kool (akool@Kool.f.EUnet.de)
For contribution of the isdnlog/isdnrep-tool
For lot of new ideas and the pcbit driver.
Eberhard Moenkeberg (emoenke@gwdg.de)
-Index: linux-2.4.35.4/Documentation/isdn/HiSax.cert
-===================================================================
---- linux-2.4.35.4.orig/Documentation/isdn/HiSax.cert
-+++ linux-2.4.35.4/Documentation/isdn/HiSax.cert
+--- a/Documentation/isdn/HiSax.cert
++++ b/Documentation/isdn/HiSax.cert
@@ -68,6 +68,8 @@ drivers/isdn/hisax/cert.c
drivers/isdn/hisax/elsa.c
drivers/isdn/hisax/diva.c
Please send any changes, bugfixes and patches to me rather than implementing
them directly into the HiSax sources.
-Index: linux-2.4.35.4/Documentation/isdn/INTERFACE
-===================================================================
---- linux-2.4.35.4.orig/Documentation/isdn/INTERFACE
-+++ linux-2.4.35.4/Documentation/isdn/INTERFACE
+--- a/Documentation/isdn/INTERFACE
++++ b/Documentation/isdn/INTERFACE
@@ -1,4 +1,4 @@
-$Id: INTERFACE,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $
+$Id: INTERFACE,v 1.17 2002/01/31 13:26:35 keil Exp $
+ command = ISDN_STAT_PROCEED
+ arg = channel-number, locally to the driver. (starting with 0)
+
-Index: linux-2.4.35.4/Documentation/isdn/INTERFACE.fax
-===================================================================
---- linux-2.4.35.4.orig/Documentation/isdn/INTERFACE.fax
-+++ linux-2.4.35.4/Documentation/isdn/INTERFACE.fax
+--- a/Documentation/isdn/INTERFACE.fax
++++ b/Documentation/isdn/INTERFACE.fax
@@ -1,4 +1,4 @@
-$Id: INTERFACE.fax,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $
+$Id: INTERFACE.fax,v 1.2 2000/08/06 09:22:50 armin Exp $
Description of the fax-subinterface between linklevel and hardwarelevel of
-Index: linux-2.4.35.4/Documentation/isdn/README
-===================================================================
---- linux-2.4.35.4.orig/Documentation/isdn/README
-+++ linux-2.4.35.4/Documentation/isdn/README
+--- a/Documentation/isdn/README
++++ b/Documentation/isdn/README
@@ -278,6 +278,12 @@ README for the ISDN-subsystem
1 = Add CPN to FCON message on
Bit 2: 0 = Add CDN to RING/FCON message off
Last but not least a (at the moment fairly primitive) device to request
the line-status (/dev/isdninfo) is made available.
-Index: linux-2.4.35.4/Documentation/isdn/README.HiSax
-===================================================================
---- linux-2.4.35.4.orig/Documentation/isdn/README.HiSax
-+++ linux-2.4.35.4/Documentation/isdn/README.HiSax
+--- a/Documentation/isdn/README.HiSax
++++ b/Documentation/isdn/README.HiSax
@@ -41,10 +41,9 @@ ELSA Quickstep 3000 (same settings as QS
ELSA Quickstep 3000PCI
ELSA PCMCIA
Running the driver
------------------
-Index: linux-2.4.35.4/Documentation/isdn/README.act2000
-===================================================================
---- linux-2.4.35.4.orig/Documentation/isdn/README.act2000
-+++ linux-2.4.35.4/Documentation/isdn/README.act2000
+--- a/Documentation/isdn/README.act2000
++++ b/Documentation/isdn/README.act2000
@@ -1,4 +1,4 @@
-$Id: README.act2000,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $
+$Id: README.act2000,v 1.3 2000/08/06 09:22:51 armin Exp $
This document describes the ACT2000 driver for the
IBM Active 2000 ISDN card.
-Index: linux-2.4.35.4/Documentation/isdn/README.audio
-===================================================================
---- linux-2.4.35.4.orig/Documentation/isdn/README.audio
-+++ linux-2.4.35.4/Documentation/isdn/README.audio
+--- a/Documentation/isdn/README.audio
++++ b/Documentation/isdn/README.audio
@@ -1,4 +1,4 @@
-$Id: README.audio,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $
+$Id: README.audio,v 1.8 1999/07/11 17:17:29 armin Exp $
ISDN subsystem for Linux.
Description of audio mode.
-Index: linux-2.4.35.4/Documentation/isdn/README.eicon
-===================================================================
---- linux-2.4.35.4.orig/Documentation/isdn/README.eicon
-+++ linux-2.4.35.4/Documentation/isdn/README.eicon
+--- a/Documentation/isdn/README.eicon
++++ b/Documentation/isdn/README.eicon
@@ -1,4 +1,4 @@
-$Id: README.eicon,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $
+$Id: README.eicon,v 1.10 2000/08/13 12:19:15 armin Exp $
(c) 1999,2000 Armin Schindler (mac@melware.de)
(c) 1999,2000 Cytronics & Melware (info@melware.de)
-Index: linux-2.4.35.4/Documentation/isdn/README.hysdn
-===================================================================
---- linux-2.4.35.4.orig/Documentation/isdn/README.hysdn
-+++ linux-2.4.35.4/Documentation/isdn/README.hysdn
+--- a/Documentation/isdn/README.hysdn
++++ b/Documentation/isdn/README.hysdn
@@ -1,4 +1,4 @@
-$Id: README.hysdn,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $
+$Id: README.hysdn,v 1.3.6.1 2001/02/10 14:41:19 kai Exp $
The hysdn driver has been written by
by Werner Cornelius (werner@isdn4linux.de or werner@titro.de)
for Hypercope GmbH Aachen Germany. Hypercope agreed to publish this driver
-Index: linux-2.4.35.4/Documentation/isdn/README.icn
-===================================================================
---- linux-2.4.35.4.orig/Documentation/isdn/README.icn
-+++ linux-2.4.35.4/Documentation/isdn/README.icn
+--- a/Documentation/isdn/README.icn
++++ b/Documentation/isdn/README.icn
@@ -1,4 +1,4 @@
-$Id: README.icn,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $
+$Id: README.icn,v 1.7 2000/08/06 09:22:51 armin Exp $
You can get the ICN-ISDN-card from:
-Index: linux-2.4.35.4/Documentation/isdn/README.pcbit
-===================================================================
---- linux-2.4.35.4.orig/Documentation/isdn/README.pcbit
-+++ linux-2.4.35.4/Documentation/isdn/README.pcbit
+--- a/Documentation/isdn/README.pcbit
++++ b/Documentation/isdn/README.pcbit
@@ -37,4 +37,4 @@ mailing list (isdn4linux@listserv.isdn4l
regards,
Pedro.
-<pedro_m@yahoo.com>
+<roque@di.fc.ul.pt>
-Index: linux-2.4.35.4/Documentation/isdn/abcext_kernel.help
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/Documentation/isdn/abcext_kernel.help
++++ b/Documentation/isdn/abcext_kernel.help
@@ -0,0 +1,166 @@
+
+ISDN-ABC-DW Extension
+ See "linux/Documentation/isdn/dw-abc-extension-howto.txt"
+ for more Information
+
-Index: linux-2.4.35.4/drivers/isdn/Config.in
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/Config.in
-+++ linux-2.4.35.4/drivers/isdn/Config.in
+--- a/drivers/isdn/Config.in
++++ b/drivers/isdn/Config.in
@@ -4,11 +4,9 @@
# only included if CONFIG_ISDN != n
fi
endmenu
-Index: linux-2.4.35.4/drivers/isdn/Makefile
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/Makefile
-+++ linux-2.4.35.4/drivers/isdn/Makefile
+--- a/drivers/isdn/Makefile
++++ b/drivers/isdn/Makefile
@@ -2,7 +2,7 @@
# The target object and module list name.
subdir-$(CONFIG_ISDN_DRV_ICN) += icn
subdir-$(CONFIG_ISDN_DRV_PCBIT) += pcbit
subdir-$(CONFIG_ISDN_DRV_SC) += sc
-Index: linux-2.4.35.4/drivers/isdn/act2000/act2000.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/act2000/act2000.h
-+++ linux-2.4.35.4/drivers/isdn/act2000/act2000.h
+--- a/drivers/isdn/act2000/act2000.h
++++ b/drivers/isdn/act2000/act2000.h
@@ -1,4 +1,4 @@
-/* $Id: act2000.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id$
{
queue_task(&card->poll_tq, &tq_immediate);
mark_bh(IMMEDIATE_BH);
-Index: linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/act2000/act2000_isa.c
-+++ linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.c
+--- a/drivers/isdn/act2000/act2000_isa.c
++++ b/drivers/isdn/act2000/act2000_isa.c
@@ -1,4 +1,4 @@
-/* $Id: act2000_isa.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id$
}
}
-Index: linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/act2000/act2000_isa.h
-+++ linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.h
+--- a/drivers/isdn/act2000/act2000_isa.h
++++ b/drivers/isdn/act2000/act2000_isa.h
@@ -1,4 +1,4 @@
-/* $Id: act2000_isa.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id$
*
* ISDN lowlevel-module for the IBM ISDN-S0 Active 2000 (ISA-Version).
*
-Index: linux-2.4.35.4/drivers/isdn/act2000/capi.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/act2000/capi.c
-+++ linux-2.4.35.4/drivers/isdn/act2000/capi.c
+--- a/drivers/isdn/act2000/capi.c
++++ b/drivers/isdn/act2000/capi.c
@@ -1,4 +1,4 @@
-/* $Id: capi.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id$
#endif
{{ 0x00, 0x00}, NULL},
};
-Index: linux-2.4.35.4/drivers/isdn/act2000/capi.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/act2000/capi.h
-+++ linux-2.4.35.4/drivers/isdn/act2000/capi.h
+--- a/drivers/isdn/act2000/capi.h
++++ b/drivers/isdn/act2000/capi.h
@@ -1,4 +1,4 @@
-/* $Id: capi.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id$
actcapi_nextsmsg(act2000_card *card)
{
unsigned long flags;
-Index: linux-2.4.35.4/drivers/isdn/act2000/module.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/act2000/module.c
-+++ linux-2.4.35.4/drivers/isdn/act2000/module.c
+--- a/drivers/isdn/act2000/module.c
++++ b/drivers/isdn/act2000/module.c
@@ -1,4 +1,4 @@
-/* $Id: module.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id$
module_init(act2000_init);
module_exit(act2000_exit);
-Index: linux-2.4.35.4/drivers/isdn/avmb1/avm_cs.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/avm_cs.c
-+++ linux-2.4.35.4/drivers/isdn/avmb1/avm_cs.c
+--- a/drivers/isdn/avmb1/avm_cs.c
++++ b/drivers/isdn/avmb1/avm_cs.c
@@ -1,4 +1,4 @@
-/* $Id: avm_cs.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: avm_cs.c,v 1.6 2001/09/24 13:22:44 kai Exp $
*
* A PCMCIA client driver for AVM B1/M1/M2
*
-Index: linux-2.4.35.4/drivers/isdn/avmb1/avmcard.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/avmcard.h
-+++ linux-2.4.35.4/drivers/isdn/avmb1/avmcard.h
+--- a/drivers/isdn/avmb1/avmcard.h
++++ b/drivers/isdn/avmb1/avmcard.h
@@ -1,4 +1,4 @@
-/* $Id: avmcard.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: avmcard.h,v 1.12 2001/09/24 13:22:44 kai Exp $
*
* Copyright 1999 by Carsten Paeth <calle@calle.de>
*
-Index: linux-2.4.35.4/drivers/isdn/avmb1/b1.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1.c
-+++ linux-2.4.35.4/drivers/isdn/avmb1/b1.c
+--- a/drivers/isdn/avmb1/b1.c
++++ b/drivers/isdn/avmb1/b1.c
@@ -1,4 +1,4 @@
-/* $Id: b1.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: b1.c,v 1.26 2001/09/24 13:22:44 kai Exp $
/* ------------------------------------------------------------- */
-Index: linux-2.4.35.4/drivers/isdn/avmb1/b1dma.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1dma.c
-+++ linux-2.4.35.4/drivers/isdn/avmb1/b1dma.c
+--- a/drivers/isdn/avmb1/b1dma.c
++++ b/drivers/isdn/avmb1/b1dma.c
@@ -1,4 +1,4 @@
-/* $Id: b1dma.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: b1dma.c,v 1.18 2001/09/24 13:22:44 kai Exp $
rxlen = b1dmainmeml(card->mbase+0x28);
csr = b1dmainmeml(card->mbase+AMCC_INTCSR);
-Index: linux-2.4.35.4/drivers/isdn/avmb1/b1isa.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1isa.c
-+++ linux-2.4.35.4/drivers/isdn/avmb1/b1isa.c
+--- a/drivers/isdn/avmb1/b1isa.c
++++ b/drivers/isdn/avmb1/b1isa.c
@@ -1,4 +1,4 @@
-/* $Id: b1isa.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: b1isa.c,v 1.14 2001/09/24 13:22:44 kai Exp $
/* ------------------------------------------------------------- */
-Index: linux-2.4.35.4/drivers/isdn/avmb1/b1pci.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1pci.c
-+++ linux-2.4.35.4/drivers/isdn/avmb1/b1pci.c
+--- a/drivers/isdn/avmb1/b1pci.c
++++ b/drivers/isdn/avmb1/b1pci.c
@@ -1,4 +1,4 @@
-/* $Id: b1pci.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: b1pci.c,v 1.40 2001/09/24 13:22:44 kai Exp $
printk(KERN_INFO
"%s: PCI BIOS reports AVM-B1 at i/o %#x, irq %d\n",
-Index: linux-2.4.35.4/drivers/isdn/avmb1/b1pcmcia.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1pcmcia.c
-+++ linux-2.4.35.4/drivers/isdn/avmb1/b1pcmcia.c
+--- a/drivers/isdn/avmb1/b1pcmcia.c
++++ b/drivers/isdn/avmb1/b1pcmcia.c
@@ -1,4 +1,4 @@
-/* $Id: b1pcmcia.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: b1pcmcia.c,v 1.17 2001/09/24 13:22:44 kai Exp $
/* ------------------------------------------------------------- */
-Index: linux-2.4.35.4/drivers/isdn/avmb1/c4.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/c4.c
-+++ linux-2.4.35.4/drivers/isdn/avmb1/c4.c
+--- a/drivers/isdn/avmb1/c4.c
++++ b/drivers/isdn/avmb1/c4.c
@@ -1,4 +1,4 @@
-/* $Id: c4.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: c4.c,v 1.38 2001/09/24 13:22:44 kai Exp $
printk(KERN_INFO
"%s: PCI BIOS reports AVM-C%d at i/o %#x, irq %d, mem %#x\n",
-Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capi.c
-+++ linux-2.4.35.4/drivers/isdn/avmb1/capi.c
+--- a/drivers/isdn/avmb1/capi.c
++++ b/drivers/isdn/avmb1/capi.c
@@ -1,4 +1,4 @@
-/* $Id: capi.c,v 1.1.4.2 2001/12/09 18:45:13 kai Exp $
+/* $Id: capi.c,v 1.59 2001/11/07 22:35:48 kai Exp $
(void) detach_capi_interface(&cuser);
printk(KERN_NOTICE "capi: Rev %s: unloaded\n", rev);
}
-Index: linux-2.4.35.4/drivers/isdn/avmb1/capicmd.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capicmd.h
-+++ linux-2.4.35.4/drivers/isdn/avmb1/capicmd.h
+--- a/drivers/isdn/avmb1/capicmd.h
++++ b/drivers/isdn/avmb1/capicmd.h
@@ -1,4 +1,4 @@
-/* $Id: capicmd.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: capicmd.h,v 1.4 2001/09/24 13:22:44 kai Exp $
*
* CAPI 2.0 Interface for Linux
*
-Index: linux-2.4.35.4/drivers/isdn/avmb1/capidev.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capidev.h
-+++ linux-2.4.35.4/drivers/isdn/avmb1/capidev.h
+--- a/drivers/isdn/avmb1/capidev.h
++++ b/drivers/isdn/avmb1/capidev.h
@@ -1,4 +1,4 @@
-/* $Id: capidev.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: capidev.h,v 1.8 2001/09/24 13:22:44 kai Exp $
*
* CAPI 2.0 Interface for Linux
*
-Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capidrv.c
-+++ linux-2.4.35.4/drivers/isdn/avmb1/capidrv.c
+--- a/drivers/isdn/avmb1/capidrv.c
++++ b/drivers/isdn/avmb1/capidrv.c
@@ -1,4 +1,4 @@
-/* $Id: capidrv.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: capidrv.c,v 1.45 2001/09/24 13:22:44 kai Exp $
kfree(card->bchans);
card->bchans = 0;
-Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capidrv.h
-+++ linux-2.4.35.4/drivers/isdn/avmb1/capidrv.h
+--- a/drivers/isdn/avmb1/capidrv.h
++++ b/drivers/isdn/avmb1/capidrv.h
@@ -1,4 +1,4 @@
-/* $Id: capidrv.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: capidrv.h,v 1.4 2001/09/24 13:22:44 kai Exp $
*
* ISDN4Linux Driver, using capi20 interface (kernelcapi)
*
-Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capifs.c
-+++ linux-2.4.35.4/drivers/isdn/avmb1/capifs.c
+--- a/drivers/isdn/avmb1/capifs.c
++++ b/drivers/isdn/avmb1/capifs.c
@@ -1,4 +1,4 @@
-/* $Id: capifs.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: capifs.c,v 1.22 2001/09/24 13:22:44 kai Exp $
}
}
}
-Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capifs.h
-+++ linux-2.4.35.4/drivers/isdn/avmb1/capifs.h
+--- a/drivers/isdn/avmb1/capifs.h
++++ b/drivers/isdn/avmb1/capifs.h
@@ -1,4 +1,4 @@
-/* $Id: capifs.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: capifs.h,v 1.4 2001/09/24 13:22:44 kai Exp $
*
* Copyright 2000 by Carsten Paeth <calle@calle.de>
*
-Index: linux-2.4.35.4/drivers/isdn/avmb1/capilli.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capilli.h
-+++ linux-2.4.35.4/drivers/isdn/avmb1/capilli.h
+--- a/drivers/isdn/avmb1/capilli.h
++++ b/drivers/isdn/avmb1/capilli.h
@@ -1,4 +1,4 @@
-/* $Id: capilli.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: capilli.h,v 1.5 2001/09/24 13:22:44 kai Exp $
*
* Kernel CAPI 2.0 Driver Interface for Linux
*
-Index: linux-2.4.35.4/drivers/isdn/avmb1/capiutil.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capiutil.c
-+++ linux-2.4.35.4/drivers/isdn/avmb1/capiutil.c
+--- a/drivers/isdn/avmb1/capiutil.c
++++ b/drivers/isdn/avmb1/capiutil.c
@@ -1,4 +1,4 @@
-/* $Id: capiutil.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: capiutil.c,v 1.16 2001/09/24 13:22:44 kai Exp $
#include "capiutil.h"
MODULE_DESCRIPTION("CAPI4Linux: CAPI message conversion support");
-Index: linux-2.4.35.4/drivers/isdn/avmb1/capiutil.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capiutil.h
-+++ linux-2.4.35.4/drivers/isdn/avmb1/capiutil.h
+--- a/drivers/isdn/avmb1/capiutil.h
++++ b/drivers/isdn/avmb1/capiutil.h
@@ -1,4 +1,4 @@
-/* $Id: capiutil.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: capiutil.h,v 1.7 2001/09/24 13:22:44 kai Exp $
*
* CAPI 2.0 defines & types
*
-Index: linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/kcapi.c
-+++ linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c
+--- a/drivers/isdn/avmb1/kcapi.c
++++ b/drivers/isdn/avmb1/kcapi.c
@@ -1,4 +1,4 @@
-/* $Id: kcapi.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: kcapi.c,v 1.28 2001/09/24 13:22:44 kai Exp $
printk(KERN_NOTICE "kcapi: card %d \"%s\" ready.\n",
CARDNR(card), card->name);
-Index: linux-2.4.35.4/drivers/isdn/avmb1/t1isa.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/t1isa.c
-+++ linux-2.4.35.4/drivers/isdn/avmb1/t1isa.c
+--- a/drivers/isdn/avmb1/t1isa.c
++++ b/drivers/isdn/avmb1/t1isa.c
@@ -1,4 +1,4 @@
-/* $Id: t1isa.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: t1isa.c,v 1.22 2001/09/24 13:22:44 kai Exp $
/* ------------------------------------------------------------- */
-Index: linux-2.4.35.4/drivers/isdn/avmb1/t1pci.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/avmb1/t1pci.c
-+++ linux-2.4.35.4/drivers/isdn/avmb1/t1pci.c
+--- a/drivers/isdn/avmb1/t1pci.c
++++ b/drivers/isdn/avmb1/t1pci.c
@@ -1,4 +1,4 @@
-/* $Id: t1pci.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: t1pci.c,v 1.25 2001/09/24 13:22:44 kai Exp $
printk(KERN_INFO
"%s: PCI BIOS reports AVM-T1-PCI at i/o %#x, irq %d, mem %#x\n",
-Index: linux-2.4.35.4/drivers/isdn/divert/divert_procfs.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/divert/divert_procfs.c
-+++ linux-2.4.35.4/drivers/isdn/divert/divert_procfs.c
+--- a/drivers/isdn/divert/divert_procfs.c
++++ b/drivers/isdn/divert/divert_procfs.c
@@ -1,4 +1,4 @@
-/* $Id: divert_procfs.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id$
#endif /* CONFIG_PROC_FS */
return (0);
-Index: linux-2.4.35.4/drivers/isdn/divert/isdn_divert.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/divert/isdn_divert.c
-+++ linux-2.4.35.4/drivers/isdn/divert/isdn_divert.c
+--- a/drivers/isdn/divert/isdn_divert.c
++++ b/drivers/isdn/divert/isdn_divert.c
@@ -1,4 +1,4 @@
-/* $Id: isdn_divert.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id$
break;
default:
-Index: linux-2.4.35.4/drivers/isdn/divert/isdn_divert.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/divert/isdn_divert.h
-+++ linux-2.4.35.4/drivers/isdn/divert/isdn_divert.h
+--- a/drivers/isdn/divert/isdn_divert.h
++++ b/drivers/isdn/divert/isdn_divert.h
@@ -1,4 +1,4 @@
-/* $Id: isdn_divert.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id$
actions 1-2 only take place if interface is opened
*/
u_char waittime; /* maximum wait time for proceeding */
-Index: linux-2.4.35.4/drivers/isdn/eicon/Divas_mod.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/eicon/Divas_mod.c
-+++ linux-2.4.35.4/drivers/isdn/eicon/Divas_mod.c
+--- a/drivers/isdn/eicon/Divas_mod.c
++++ b/drivers/isdn/eicon/Divas_mod.c
@@ -20,6 +20,7 @@
#include "adapter.h"
#include "uxio.h"
MODULE_DESCRIPTION("ISDN4Linux: Driver for Eicon Diva Server cards");
MODULE_AUTHOR("Armin Schindler");
-Index: linux-2.4.35.4/drivers/isdn/eicon/common.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/eicon/common.c
-+++ linux-2.4.35.4/drivers/isdn/eicon/common.c
+--- a/drivers/isdn/eicon/common.c
++++ b/drivers/isdn/eicon/common.c
@@ -808,9 +808,7 @@ void DivasDoDpc(void *pData)
while(i--)
}
}
-Index: linux-2.4.35.4/drivers/isdn/eicon/eicon.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon.h
-+++ linux-2.4.35.4/drivers/isdn/eicon/eicon.h
+--- a/drivers/isdn/eicon/eicon.h
++++ b/drivers/isdn/eicon/eicon.h
@@ -1,4 +1,4 @@
-/* $Id: eicon.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: eicon.h,v 1.26 2001/09/24 13:22:47 kai Exp $
{
queue_task(&card->ack_tq, &tq_immediate);
mark_bh(IMMEDIATE_BH);
-Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_dsp.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_dsp.h
-+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_dsp.h
+--- a/drivers/isdn/eicon/eicon_dsp.h
++++ b/drivers/isdn/eicon/eicon_dsp.h
@@ -1,4 +1,4 @@
-/* $Id: eicon_dsp.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: eicon_dsp.h,v 1.8 2001/09/24 13:22:47 kai Exp $
*
* ISDN lowlevel-module for Eicon active cards.
* DSP definitions
-Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_idi.c
-+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.c
+--- a/drivers/isdn/eicon/eicon_idi.c
++++ b/drivers/isdn/eicon/eicon_idi.c
@@ -1,4 +1,4 @@
-/* $Id: eicon_idi.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: eicon_idi.c,v 1.45 2001/11/07 22:35:48 kai Exp $
chan->statectrl &= ~WAITING_FOR_HANGUP;
chan->statectrl &= ~IN_HOLD;
if (chan->statectrl & HAVE_CONN_REQ) {
-Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_idi.h
-+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.h
+--- a/drivers/isdn/eicon/eicon_idi.h
++++ b/drivers/isdn/eicon/eicon_idi.h
@@ -1,4 +1,4 @@
-/* $Id: eicon_idi.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: eicon_idi.h,v 1.12 2001/09/24 13:22:47 kai Exp $
*
* ISDN lowlevel-module for the Eicon active cards.
* IDI-Interface
-Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_io.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_io.c
-+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_io.c
+--- a/drivers/isdn/eicon/eicon_io.c
++++ b/drivers/isdn/eicon/eicon_io.c
@@ -1,4 +1,4 @@
-/* $Id: eicon_io.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: eicon_io.c,v 1.15 2001/09/24 13:22:47 kai Exp $
*
* ISDN low-level module for Eicon active ISDN-Cards.
* Code for communicating with hardware.
-Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_isa.c
-+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.c
+--- a/drivers/isdn/eicon/eicon_isa.c
++++ b/drivers/isdn/eicon/eicon_isa.c
@@ -1,4 +1,4 @@
-/* $Id: eicon_isa.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: eicon_isa.c,v 1.18 2001/11/07 22:35:48 kai Exp $
#ifdef EICON_MCA_DEBUG
printk(KERN_INFO "eicon_isa_boot: card->ramsize = %d.\n", card->ramsize);
#endif
-Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_isa.h
-+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.h
+--- a/drivers/isdn/eicon/eicon_isa.h
++++ b/drivers/isdn/eicon/eicon_isa.h
@@ -1,4 +1,4 @@
-/* $Id: eicon_isa.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: eicon_isa.h,v 1.11 2001/09/24 13:22:47 kai Exp $
*
* ISDN low-level module for Eicon active ISDN-Cards.
*
-Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_mod.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_mod.c
-+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_mod.c
+--- a/drivers/isdn/eicon/eicon_mod.c
++++ b/drivers/isdn/eicon/eicon_mod.c
@@ -1,4 +1,4 @@
-/* $Id: eicon_mod.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: eicon_mod.c,v 1.44 2001/11/20 09:48:25 armin Exp $
#endif /* MODULE */
-Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_pci.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_pci.c
-+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_pci.c
+--- a/drivers/isdn/eicon/eicon_pci.c
++++ b/drivers/isdn/eicon/eicon_pci.c
@@ -1,4 +1,4 @@
-/* $Id: eicon_pci.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: eicon_pci.c,v 1.18 2001/09/24 13:22:47 kai Exp $
#if CONFIG_PCI /* intire stuff is only for PCI */
#ifdef CONFIG_ISDN_DRV_EICON_PCI
-Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_pci.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_pci.h
-+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_pci.h
+--- a/drivers/isdn/eicon/eicon_pci.h
++++ b/drivers/isdn/eicon/eicon_pci.h
@@ -1,4 +1,4 @@
-/* $Id: eicon_pci.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: eicon_pci.h,v 1.7 2001/09/24 13:22:47 kai Exp $
*
* ISDN low-level module for Eicon active ISDN-Cards (PCI part).
*
-Index: linux-2.4.35.4/drivers/isdn/eicon/fourbri.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/eicon/fourbri.c
-+++ linux-2.4.35.4/drivers/isdn/eicon/fourbri.c
+--- a/drivers/isdn/eicon/fourbri.c
++++ b/drivers/isdn/eicon/fourbri.c
@@ -337,8 +337,7 @@ static int diva_server_4bri_load(card_t
static int diva_server_4bri_start(card_t *card, byte *channels)
{
int adapter_num;
DPRINTF(("divas: start Diva Server 4BRI"));
-Index: linux-2.4.35.4/drivers/isdn/eicon/kprintf.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/eicon/kprintf.c
-+++ linux-2.4.35.4/drivers/isdn/eicon/kprintf.c
+--- a/drivers/isdn/eicon/kprintf.c
++++ b/drivers/isdn/eicon/kprintf.c
@@ -18,6 +18,468 @@
#include "divalog.h"
#include "uxio.h"
va_end(argptr);
-Index: linux-2.4.35.4/drivers/isdn/eicon/lincfg.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/eicon/lincfg.c
-+++ linux-2.4.35.4/drivers/isdn/eicon/lincfg.c
+--- a/drivers/isdn/eicon/lincfg.c
++++ b/drivers/isdn/eicon/lincfg.c
@@ -26,6 +26,9 @@
#include "uxio.h"
#include <linux/kernel.h>
#include <linux/ioport.h>
-Index: linux-2.4.35.4/drivers/isdn/eicon/linchr.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/eicon/linchr.c
-+++ linux-2.4.35.4/drivers/isdn/eicon/linchr.c
+--- a/drivers/isdn/eicon/linchr.c
++++ b/drivers/isdn/eicon/linchr.c
@@ -154,17 +154,17 @@ ssize_t do_read(struct file *pFile, char
klog_t *pHeadItem;
kfree(pHeadItem);
return sizeof(klog_t);
}
-Index: linux-2.4.35.4/drivers/isdn/eicon/linio.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/eicon/linio.c
-+++ linux-2.4.35.4/drivers/isdn/eicon/linio.c
+--- a/drivers/isdn/eicon/linio.c
++++ b/drivers/isdn/eicon/linio.c
@@ -15,6 +15,7 @@
#include <linux/slab.h>
#include <linux/pci.h>
#undef N_DATA
#include "uxio.h"
-Index: linux-2.4.35.4/drivers/isdn/hisax/Makefile
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/Makefile
-+++ linux-2.4.35.4/drivers/isdn/hisax/Makefile
+--- a/drivers/isdn/hisax/Makefile
++++ b/drivers/isdn/hisax/Makefile
@@ -4,20 +4,17 @@
O_TARGET := vmlinux-obj.o
CERT := $(shell md5sum -c md5sums.asc >> /dev/null;echo $$?)
CFLAGS_cert.o := -DCERTIFICATION=$(CERT)
-Index: linux-2.4.35.4/drivers/isdn/hisax/amd7930.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/isdn/hisax/amd7930.c
++++ b/drivers/isdn/hisax/amd7930.c
@@ -0,0 +1,755 @@
+/* $Id: amd7930.c,v 1.8 2001/09/24 13:22:55 kai Exp $
+ *
+
+ return (1);
+}
-Index: linux-2.4.35.4/drivers/isdn/hisax/arcofi.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/arcofi.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/arcofi.c
+--- a/drivers/isdn/hisax/arcofi.c
++++ b/drivers/isdn/hisax/arcofi.c
@@ -1,4 +1,4 @@
-/* $Id: arcofi.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: arcofi.c,v 1.14 2001/09/24 13:22:55 kai Exp $
*
* Ansteuerung ARCOFI 2165
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/arcofi.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/arcofi.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/arcofi.h
+--- a/drivers/isdn/hisax/arcofi.h
++++ b/drivers/isdn/hisax/arcofi.h
@@ -1,4 +1,4 @@
-/* $Id: arcofi.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id$
*
* Ansteuerung ARCOFI 2165
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/asuscom.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/asuscom.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/asuscom.c
+--- a/drivers/isdn/hisax/asuscom.c
++++ b/drivers/isdn/hisax/asuscom.c
@@ -1,4 +1,4 @@
-/* $Id: asuscom.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: asuscom.c,v 1.14 2001/09/24 13:22:55 kai Exp $
bytecnt = 8;
cs->hw.asus.cfg_reg = card->para[1];
cs->irq = card->para[0];
-Index: linux-2.4.35.4/drivers/isdn/hisax/avm_a1.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/avm_a1.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/avm_a1.c
+--- a/drivers/isdn/hisax/avm_a1.c
++++ b/drivers/isdn/hisax/avm_a1.c
@@ -1,4 +1,4 @@
-/* $Id: avm_a1.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: avm_a1.c,v 2.15 2001/09/24 13:22:55 kai Exp $
#define AVM_A1_STAT_ISAC 0x01
#define AVM_A1_STAT_HSCX 0x02
-Index: linux-2.4.35.4/drivers/isdn/hisax/avm_a1p.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/avm_a1p.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/avm_a1p.c
+--- a/drivers/isdn/hisax/avm_a1p.c
++++ b/drivers/isdn/hisax/avm_a1p.c
@@ -1,4 +1,4 @@
-/* $Id: avm_a1p.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: avm_a1p.c,v 2.9 2001/09/24 13:22:55 kai Exp $
static inline u_char
ReadISAC(struct IsdnCardState *cs, u_char offset)
-Index: linux-2.4.35.4/drivers/isdn/hisax/avm_pci.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/avm_pci.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/avm_pci.c
+--- a/drivers/isdn/hisax/avm_pci.c
++++ b/drivers/isdn/hisax/avm_pci.c
@@ -1,4 +1,4 @@
-/* $Id: avm_pci.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: avm_pci.c,v 1.29 2001/09/24 13:22:55 kai Exp $
cs->hw.avm.isac = cs->hw.avm.cfg_reg + 0x10;
if (check_region((cs->hw.avm.cfg_reg), 32)) {
printk(KERN_WARNING
-Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_a4t.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/bkm_a4t.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/bkm_a4t.c
+--- a/drivers/isdn/hisax/bkm_a4t.c
++++ b/drivers/isdn/hisax/bkm_a4t.c
@@ -1,4 +1,4 @@
-/* $Id: bkm_a4t.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: bkm_a4t.c,v 1.22 2001/09/24 13:22:55 kai Exp $
cs->irq = dev_a4t->irq;
break;
}
-Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_a8.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/bkm_a8.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/bkm_a8.c
+--- a/drivers/isdn/hisax/bkm_a8.c
++++ b/drivers/isdn/hisax/bkm_a8.c
@@ -1,4 +1,4 @@
-/* $Id: bkm_a8.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: bkm_a8.c,v 1.22 2001/09/24 13:22:55 kai Exp $
}
#endif /* End HACK */
}
-Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_ax.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/bkm_ax.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/bkm_ax.h
+--- a/drivers/isdn/hisax/bkm_ax.h
++++ b/drivers/isdn/hisax/bkm_ax.h
@@ -1,4 +1,4 @@
-/* $Id: bkm_ax.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id$
*
* low level decls for T-Berkom cards A4T and Scitel Quadro (4*S0, passive)
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/callc.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/callc.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/callc.c
+--- a/drivers/isdn/hisax/callc.c
++++ b/drivers/isdn/hisax/callc.c
@@ -1,4 +1,4 @@
-/* $Id: callc.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: callc.c,v 2.59 2002/02/09 21:19:11 keil Exp $
case (CC_PROGRESS | INDICATION):
case (CC_NOTIFY | INDICATION):
break;
-Index: linux-2.4.35.4/drivers/isdn/hisax/cert.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/cert.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/cert.c
+--- a/drivers/isdn/hisax/cert.c
++++ b/drivers/isdn/hisax/cert.c
@@ -1,4 +1,4 @@
-/* $Id: cert.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: cert.c,v 2.6 2001/09/24 13:22:56 kai Exp $
*
* Author Karsten Keil
* Copyright by Karsten Keil <keil@isdn4linux.de>
-Index: linux-2.4.35.4/drivers/isdn/hisax/config.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/config.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/config.c
+--- a/drivers/isdn/hisax/config.c
++++ b/drivers/isdn/hisax/config.c
@@ -1,4 +1,4 @@
-/* $Id: config.c,v 1.1.4.5 2001/12/09 19:19:26 kai Exp $
+/* $Id: config.c,v 2.84 2002/08/13 09:55:29 keil Exp $
-EXPORT_SYMBOL(FsmInitTimer);
-EXPORT_SYMBOL(FsmDelTimer);
-EXPORT_SYMBOL(FsmRestartTimer);
-Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/diva.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/diva.c
+--- a/drivers/isdn/hisax/diva.c
++++ b/drivers/isdn/hisax/diva.c
@@ -1,4 +1,4 @@
-/* $Id: diva.c,v 1.1.4.2 2002/08/30 11:21:00 keil Exp $
+/* $Id: diva.c,v 1.33 2001/09/24 13:22:56 kai Exp $
} else { /* DIVA 2.0 */
cs->hw.diva.tl.function = (void *) diva_led_handler;
cs->hw.diva.tl.data = (long) cs;
-Index: linux-2.4.35.4/drivers/isdn/hisax/elsa.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/elsa.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/elsa.c
+--- a/drivers/isdn/hisax/elsa.c
++++ b/drivers/isdn/hisax/elsa.c
@@ -1,4 +1,4 @@
-/* $Id: elsa.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: elsa.c,v 2.32 2001/09/24 13:22:56 kai Exp $
case ELSA_QS3000PCI:
bytecnt = 16;
break;
-Index: linux-2.4.35.4/drivers/isdn/hisax/elsa_cs.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/elsa_cs.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/elsa_cs.c
+--- a/drivers/isdn/hisax/elsa_cs.c
++++ b/drivers/isdn/hisax/elsa_cs.c
@@ -72,7 +72,7 @@ static int pc_debug = PCMCIA_DEBUG;
MODULE_PARM(pc_debug, "i");
#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args);
#else
#define DEBUG(n, args...)
#endif
-Index: linux-2.4.35.4/drivers/isdn/hisax/elsa_ser.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/elsa_ser.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/elsa_ser.c
+--- a/drivers/isdn/hisax/elsa_ser.c
++++ b/drivers/isdn/hisax/elsa_ser.c
@@ -1,4 +1,4 @@
-/* $Id: elsa_ser.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: elsa_ser.c,v 2.14 2001/09/24 13:22:56 kai Exp $
static void rs_interrupt_elsa(int irq, struct IsdnCardState *cs)
{
-Index: linux-2.4.35.4/drivers/isdn/hisax/fsm.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/fsm.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/fsm.c
+--- a/drivers/isdn/hisax/fsm.c
++++ b/drivers/isdn/hisax/fsm.c
@@ -1,4 +1,4 @@
-/* $Id: fsm.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id$
int __init
FsmNew(struct Fsm *fsm, struct FsmNode *fnlist, int fncount)
{
-Index: linux-2.4.35.4/drivers/isdn/hisax/fsm.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/fsm.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/fsm.h
+--- a/drivers/isdn/hisax/fsm.h
++++ b/drivers/isdn/hisax/fsm.h
@@ -1,4 +1,4 @@
-/* $Id: fsm.h,v 1.1.2.1 2001/11/20 14:19:35 kai Exp $
+/* $Id$
*
* Finite state machine
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/gazel.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/gazel.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/gazel.c
+--- a/drivers/isdn/hisax/gazel.c
++++ b/drivers/isdn/hisax/gazel.c
@@ -1,4 +1,4 @@
-/* $Id: gazel.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: gazel.c,v 2.19 2001/09/24 13:22:56 kai Exp $
found = 1;
}
if (found)
-Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_2bds0.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.c
+--- a/drivers/isdn/hisax/hfc_2bds0.c
++++ b/drivers/isdn/hisax/hfc_2bds0.c
@@ -1,4 +1,4 @@
-/* $Id: hfc_2bds0.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: hfc_2bds0.c,v 1.18 2001/09/24 13:22:56 kai Exp $
}
unsigned int __init
-Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_2bds0.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.h
+--- a/drivers/isdn/hisax/hfc_2bds0.h
++++ b/drivers/isdn/hisax/hfc_2bds0.h
@@ -1,4 +1,4 @@
-/* $Id: hfc_2bds0.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: hfc_2bds0.h,v 1.6 2001/09/24 13:22:56 kai Exp $
*
* specific defines for CCD's HFC 2BDS0
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bs0.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_2bs0.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_2bs0.c
+--- a/drivers/isdn/hisax/hfc_2bs0.c
++++ b/drivers/isdn/hisax/hfc_2bs0.c
@@ -1,4 +1,4 @@
-/* $Id: hfc_2bs0.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: hfc_2bs0.c,v 1.20 2001/09/24 13:22:56 kai Exp $
*
* specific routines for CCD's HFC 2BS0
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bs0.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_2bs0.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_2bs0.h
+--- a/drivers/isdn/hisax/hfc_2bs0.h
++++ b/drivers/isdn/hisax/hfc_2bs0.h
@@ -1,4 +1,4 @@
-/* $Id: hfc_2bs0.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: hfc_2bs0.h,v 1.5 2001/09/24 13:22:56 kai Exp $
*
* specific defines for CCD's HFC 2BS0
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_pci.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.c
+--- a/drivers/isdn/hisax/hfc_pci.c
++++ b/drivers/isdn/hisax/hfc_pci.c
@@ -1,4 +1,4 @@
-/* $Id: hfc_pci.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: hfc_pci.c,v 1.48 2001/09/24 13:22:56 kai Exp $
(((ulong) cs->hw.hfcpci.share_start) & ~0x7FFF) + 0x8000;
pcibios_write_config_dword(cs->hw.hfcpci.pci_bus,
cs->hw.hfcpci.pci_device_fn, 0x80,
-Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_pci.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.h
+--- a/drivers/isdn/hisax/hfc_pci.h
++++ b/drivers/isdn/hisax/hfc_pci.h
@@ -1,4 +1,4 @@
-/* $Id: hfc_pci.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: hfc_pci.h,v 1.10 2001/09/24 13:22:56 kai Exp $
*
* specific defines for CCD's HFC 2BDS0 PCI chips
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_sx.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.c
+--- a/drivers/isdn/hisax/hfc_sx.c
++++ b/drivers/isdn/hisax/hfc_sx.c
@@ -1,4 +1,4 @@
-/* $Id: hfc_sx.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: hfc_sx.c,v 1.12 2001/09/24 13:22:56 kai Exp $
+
+
+
-Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_sx.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.h
+--- a/drivers/isdn/hisax/hfc_sx.h
++++ b/drivers/isdn/hisax/hfc_sx.h
@@ -1,4 +1,4 @@
-/* $Id: hfc_sx.h,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id$
*
* specific defines for CCD's HFC 2BDS0 S+,SP chips
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c
++++ b/drivers/isdn/hisax/hfc_usb.c
@@ -0,0 +1,1189 @@
+/* $Id: hfc_usb.c,v 2.3 2001/07/06 21:30:11 werner Exp $
+ *
+
+module_init(hfc_usb_init);
+module_exit(hfc_usb_exit);
-Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usbr.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_usbr.c
++++ b/drivers/isdn/hisax/hfc_usbr.c
@@ -0,0 +1,471 @@
+/* $Id: hfc_usbr.c,v 2.5 2001/07/06 21:30:11 werner Exp $
+
+ cs->cardmsg = &hfcusb_card_msg;
+ return (1); /* success */
+}
-Index: linux-2.4.35.4/drivers/isdn/hisax/hfcscard.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfcscard.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/hfcscard.c
+--- a/drivers/isdn/hisax/hfcscard.c
++++ b/drivers/isdn/hisax/hfcscard.c
@@ -1,4 +1,4 @@
-/* $Id: hfcscard.c,v 1.1.4.1 2001/11/20 14:19:35 kai Exp $
+/* $Id: hfcscard.c,v 1.10 2001/09/24 13:22:56 kai Exp $
cs->hw.hfcD.addr = card->para[1] & 0xfffe;
cs->irq = card->para[0];
cs->hw.hfcD.cip = 0;
-Index: linux-2.4.35.4/drivers/isdn/hisax/hisax.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/hisax.h
+--- a/drivers/isdn/hisax/hisax.h
++++ b/drivers/isdn/hisax/hisax.h
@@ -1,4 +1,4 @@
-/* $Id: hisax.h,v 1.1.4.2 2001/12/09 19:15:28 kai Exp $
+/* $Id: hisax.h,v 2.64 2001/09/24 13:22:56 kai Exp $
#define TEI_PER_CARD 1
/* L1 Debug */
-Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_debug.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_debug.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_debug.h
+--- a/drivers/isdn/hisax/hisax_debug.h
++++ b/drivers/isdn/hisax/hisax_debug.h
@@ -28,7 +28,7 @@
#define DBG(level, format, arg...) do { \
} while (0)
#define DBG_PACKET(level,data,count) \
-Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_fcpcipnp.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c
+--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
++++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -20,22 +20,19 @@
*
* o POWER PC
+#ifdef __ISAPNP__
+#include "hisax_isapnp.c"
+#endif
-Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_fcpcipnp.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.h
+--- a/drivers/isdn/hisax/hisax_fcpcipnp.h
++++ b/drivers/isdn/hisax/hisax_fcpcipnp.h
@@ -43,10 +43,12 @@ struct fritz_bcs {
};
struct isac isac;
struct fritz_bcs bcs[2];
-Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_isac.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c
+--- a/drivers/isdn/hisax/hisax_isac.c
++++ b/drivers/isdn/hisax/hisax_isac.c
@@ -34,7 +34,7 @@
static int debug = 1;
MODULE_PARM(debug, "i");
module_init(hisax_isac_init);
module_exit(hisax_isac_exit);
-Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_isac.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.h
+--- a/drivers/isdn/hisax/hisax_isac.h
++++ b/drivers/isdn/hisax/hisax_isac.h
@@ -8,7 +8,7 @@
#define TIMER3_VALUE 7000
#define MAX_DFRAME_LEN_L1 300
+void isacsx_interrupt(struct isac *isac);
#endif
-Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.c
++++ b/drivers/isdn/hisax/hisax_isapnp.c
@@ -0,0 +1,105 @@
+// FIXME copied
+static const struct isapnp_device_id *
+ }
+}
+
-Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.h
++++ b/drivers/isdn/hisax/hisax_isapnp.h
@@ -0,0 +1,33 @@
+#ifndef __HISAX_ISAPNP_H__
+#define __HISAX_ISAPNP_H__
+#endif
+
+#endif
-Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_loadable.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_loadable.h
++++ b/drivers/isdn/hisax/hisax_loadable.h
@@ -0,0 +1,74 @@
+/* $Id: hisax_loadable.h,v 2.1 2001/06/08 22:19:16 werner Exp $
+ *
+/* definition of the register function */
+/***************************************/
+extern int hisax_register_hfcusb(struct hisax_drvreg *l1drv);
-Index: linux-2.4.35.4/drivers/isdn/hisax/hscx.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hscx.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/hscx.c
+--- a/drivers/isdn/hisax/hscx.c
++++ b/drivers/isdn/hisax/hscx.c
@@ -1,4 +1,4 @@
-/* $Id: hscx.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: hscx.c,v 1.24 2001/09/24 13:22:56 kai Exp $
*
* HSCX specific routines
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/hscx.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hscx.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/hscx.h
+--- a/drivers/isdn/hisax/hscx.h
++++ b/drivers/isdn/hisax/hscx.h
@@ -1,4 +1,4 @@
-/* $Id: hscx.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: hscx.h,v 1.8 2001/09/24 13:22:56 kai Exp $
*
* HSCX specific defines
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/hscx_irq.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hscx_irq.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/hscx_irq.c
+--- a/drivers/isdn/hisax/hscx_irq.c
++++ b/drivers/isdn/hisax/hscx_irq.c
@@ -1,4 +1,4 @@
-/* $Id: hscx_irq.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: hscx_irq.c,v 1.18 2001/09/24 13:22:56 kai Exp $
*
* low level b-channel stuff for Siemens HSCX
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/icc.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/icc.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/icc.c
+--- a/drivers/isdn/hisax/icc.c
++++ b/drivers/isdn/hisax/icc.c
@@ -1,4 +1,4 @@
-/* $Id: icc.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: icc.c,v 1.8 2001/09/24 13:22:56 kai Exp $
*
* ICC specific routines
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/icc.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/icc.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/icc.h
+--- a/drivers/isdn/hisax/icc.h
++++ b/drivers/isdn/hisax/icc.h
@@ -1,4 +1,4 @@
-/* $Id: icc.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: icc.h,v 1.4 2001/09/24 13:22:56 kai Exp $
*
* ICC specific routines
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/ipac.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/ipac.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/ipac.h
+--- a/drivers/isdn/hisax/ipac.h
++++ b/drivers/isdn/hisax/ipac.h
@@ -1,4 +1,4 @@
-/* $Id: ipac.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: ipac.h,v 1.7 2001/09/24 13:22:56 kai Exp $
*
* IPAC specific defines
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/isac.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/isac.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/isac.c
+--- a/drivers/isdn/hisax/isac.c
++++ b/drivers/isdn/hisax/isac.c
@@ -1,4 +1,4 @@
-/* $Id: isac.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: isac.c,v 1.31 2001/09/24 13:22:56 kai Exp $
*
* ISAC specific routines
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/isac.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/isac.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/isac.h
+--- a/drivers/isdn/hisax/isac.h
++++ b/drivers/isdn/hisax/isac.h
@@ -1,4 +1,4 @@
-/* $Id: isac.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: isac.h,v 1.9 2001/09/24 13:22:56 kai Exp $
*
* ISAC specific defines
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/isar.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/isar.c
+--- a/drivers/isdn/hisax/isar.c
++++ b/drivers/isdn/hisax/isar.c
@@ -1,4 +1,4 @@
-/* $Id: isar.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: isar.c,v 1.22 2001/09/23 12:00:05 keil Exp $
default:
printk(KERN_DEBUG "HiSax: invalid ioctl %d\n",
(int) ic->arg);
-Index: linux-2.4.35.4/drivers/isdn/hisax/isar.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/isar.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/isar.h
+--- a/drivers/isdn/hisax/isar.h
++++ b/drivers/isdn/hisax/isar.h
@@ -1,4 +1,4 @@
-/* $Id: isar.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: isar.h,v 1.11 2001/09/24 13:22:56 kai Exp $
extern int ISARVersion(struct IsdnCardState *cs, char *s);
extern void isar_int_main(struct IsdnCardState *cs);
extern void initisar(struct IsdnCardState *cs);
-Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl1.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl1.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/isdnl1.c
+--- a/drivers/isdn/hisax/isdnl1.c
++++ b/drivers/isdn/hisax/isdnl1.c
@@ -1,4 +1,4 @@
-/* $Id: isdnl1.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: isdnl1.c,v 2.46 2001/09/24 13:22:56 kai Exp $
#define __NO_VERSION__
#include <linux/init.h>
-Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl1.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl1.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/isdnl1.h
+--- a/drivers/isdn/hisax/isdnl1.h
++++ b/drivers/isdn/hisax/isdnl1.h
@@ -1,4 +1,4 @@
-/* $Id: isdnl1.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: isdnl1.h,v 2.12 2001/09/24 13:22:56 kai Exp $
*
* Layer 1 defines
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl2.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl2.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/isdnl2.c
+--- a/drivers/isdn/hisax/isdnl2.c
++++ b/drivers/isdn/hisax/isdnl2.c
@@ -1,4 +1,4 @@
-/* $Id: isdnl2.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: isdnl2.c,v 2.30 2001/09/24 13:22:56 kai Exp $
}
static void
-Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl2.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl2.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/isdnl2.h
+--- a/drivers/isdn/hisax/isdnl2.h
++++ b/drivers/isdn/hisax/isdnl2.h
@@ -1,4 +1,4 @@
-/* $Id: isdnl2.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id$
*
* Layer 2 defines
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl3.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl3.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/isdnl3.c
+--- a/drivers/isdn/hisax/isdnl3.c
++++ b/drivers/isdn/hisax/isdnl3.c
@@ -1,4 +1,4 @@
-/* $Id: isdnl3.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: isdnl3.c,v 2.22 2001/09/24 13:22:56 kai Exp $
static struct Fsm l3fsm;
-Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl3.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl3.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/isdnl3.h
+--- a/drivers/isdn/hisax/isdnl3.h
++++ b/drivers/isdn/hisax/isdnl3.h
@@ -1,4 +1,4 @@
-/* $Id: isdnl3.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id$
*
* This software may be used and distributed according to the terms
* of the GNU General Public License, incorporated herein by reference.
-Index: linux-2.4.35.4/drivers/isdn/hisax/isurf.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/isurf.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/isurf.c
+--- a/drivers/isdn/hisax/isurf.c
++++ b/drivers/isdn/hisax/isurf.c
@@ -1,4 +1,4 @@
-/* $Id: isurf.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: isurf.c,v 1.12 2001/09/24 13:22:56 kai Exp $
printk(KERN_INFO
"ISurf: defined at 0x%x 0x%lx IRQ %d\n",
cs->hw.isurf.reset,
-Index: linux-2.4.35.4/drivers/isdn/hisax/ix1_micro.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/ix1_micro.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/ix1_micro.c
+--- a/drivers/isdn/hisax/ix1_micro.c
++++ b/drivers/isdn/hisax/ix1_micro.c
@@ -1,4 +1,4 @@
-/* $Id: ix1_micro.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: ix1_micro.c,v 2.12 2001/09/24 13:22:56 kai Exp $
/* IO-Ports */
cs->hw.ix1.isac_ale = card->para[1] + ISAC_COMMAND_OFFSET;
cs->hw.ix1.hscx_ale = card->para[1] + HSCX_COMMAND_OFFSET;
-Index: linux-2.4.35.4/drivers/isdn/hisax/jade.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/jade.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/jade.c
+--- a/drivers/isdn/hisax/jade.c
++++ b/drivers/isdn/hisax/jade.c
@@ -1,4 +1,4 @@
-/* $Id: jade.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: jade.c,v 1.9 2001/09/24 13:22:56 kai Exp $
*
* JADE stuff (derived from original hscx.c)
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/jade.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/jade.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/jade.h
+--- a/drivers/isdn/hisax/jade.h
++++ b/drivers/isdn/hisax/jade.h
@@ -1,4 +1,4 @@
-/* $Id: jade.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: jade.h,v 1.5 2001/09/24 13:22:56 kai Exp $
*
* JADE specific defines
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/jade_irq.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/jade_irq.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/jade_irq.c
+--- a/drivers/isdn/hisax/jade_irq.c
++++ b/drivers/isdn/hisax/jade_irq.c
@@ -1,4 +1,4 @@
-/* $Id: jade_irq.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: jade_irq.c,v 1.7 2001/09/24 13:22:56 kai Exp $
*
* Low level JADE IRQ stuff (derived from original hscx_irq.c)
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/l3_1tr6.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/l3_1tr6.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/l3_1tr6.c
+--- a/drivers/isdn/hisax/l3_1tr6.c
++++ b/drivers/isdn/hisax/l3_1tr6.c
@@ -1,4 +1,4 @@
-/* $Id: l3_1tr6.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: l3_1tr6.c,v 2.15 2001/09/24 13:22:56 kai Exp $
#define MsgHead(ptr, cref, mty, dis) \
*ptr++ = dis; \
-Index: linux-2.4.35.4/drivers/isdn/hisax/l3_1tr6.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/l3_1tr6.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/l3_1tr6.h
+--- a/drivers/isdn/hisax/l3_1tr6.h
++++ b/drivers/isdn/hisax/l3_1tr6.h
@@ -1,4 +1,4 @@
-/* $Id: l3_1tr6.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id$
*
* German 1TR6 D-channel protocol defines
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/l3dss1.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/l3dss1.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/l3dss1.c
+--- a/drivers/isdn/hisax/l3dss1.c
++++ b/drivers/isdn/hisax/l3dss1.c
@@ -1,4 +1,4 @@
-/* $Id: l3dss1.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: l3dss1.c,v 2.32 2001/09/24 13:22:56 kai Exp $
#define EXT_BEARER_CAPS 1
-Index: linux-2.4.35.4/drivers/isdn/hisax/l3dss1.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/l3dss1.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/l3dss1.h
+--- a/drivers/isdn/hisax/l3dss1.h
++++ b/drivers/isdn/hisax/l3dss1.h
@@ -1,4 +1,4 @@
-/* $Id: l3dss1.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id$
*
* DSS1 (Euro) D-channel protocol defines
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/l3ni1.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/l3ni1.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/l3ni1.c
+--- a/drivers/isdn/hisax/l3ni1.c
++++ b/drivers/isdn/hisax/l3ni1.c
@@ -1,4 +1,4 @@
-/* $Id: l3ni1.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: l3ni1.c,v 2.8 2001/09/24 13:22:56 kai Exp $
#define EXT_BEARER_CAPS 1
-Index: linux-2.4.35.4/drivers/isdn/hisax/l3ni1.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/l3ni1.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/l3ni1.h
+--- a/drivers/isdn/hisax/l3ni1.h
++++ b/drivers/isdn/hisax/l3ni1.h
@@ -1,4 +1,4 @@
-/* $Id: l3ni1.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id$
*
* NI1 D-channel protocol
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/lmgr.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/lmgr.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/lmgr.c
+--- a/drivers/isdn/hisax/lmgr.c
++++ b/drivers/isdn/hisax/lmgr.c
@@ -1,4 +1,4 @@
-/* $Id: lmgr.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id$
*
* Layermanagement module
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/md5sums.asc
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/md5sums.asc
-+++ linux-2.4.35.4/drivers/isdn/hisax/md5sums.asc
+--- a/drivers/isdn/hisax/md5sums.asc
++++ b/drivers/isdn/hisax/md5sums.asc
@@ -1,33 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-GIKgAEdRLzERmpt/bCCwAbY=
-=FaHw
------END PGP SIGNATURE-----
-Index: linux-2.4.35.4/drivers/isdn/hisax/mic.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/mic.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/mic.c
+--- a/drivers/isdn/hisax/mic.c
++++ b/drivers/isdn/hisax/mic.c
@@ -1,4 +1,4 @@
-/* $Id: mic.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: mic.c,v 1.12 2001/09/24 13:22:56 kai Exp $
#define byteout(addr,val) outb(val,addr)
#define bytein(addr) inb(addr)
-Index: linux-2.4.35.4/drivers/isdn/hisax/netjet.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/netjet.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/netjet.c
+--- a/drivers/isdn/hisax/netjet.c
++++ b/drivers/isdn/hisax/netjet.c
@@ -1,4 +1,4 @@
-/* $Id: netjet.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: netjet.c,v 1.29 2001/09/24 13:22:56 kai Exp $
l1_msg_b(st, pr, arg);
break;
case (PH_DEACTIVATE | CONFIRM):
-Index: linux-2.4.35.4/drivers/isdn/hisax/netjet.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/netjet.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/netjet.h
+--- a/drivers/isdn/hisax/netjet.h
++++ b/drivers/isdn/hisax/netjet.h
@@ -1,4 +1,4 @@
-/* $Id: netjet.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: netjet.h,v 2.8 2001/09/24 13:22:56 kai Exp $
*
* NETjet common header file
*
-Index: linux-2.4.35.4/drivers/isdn/hisax/niccy.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/niccy.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/niccy.c
+--- a/drivers/isdn/hisax/niccy.c
++++ b/drivers/isdn/hisax/niccy.c
@@ -1,4 +1,4 @@
-/* $Id: niccy.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: niccy.c,v 1.21 2001/10/20 22:05:00 kai Exp $
if (!pci_ioaddr) {
printk(KERN_WARNING "Niccy: No IO-Adr for PCI card found\n");
return(0);
-Index: linux-2.4.35.4/drivers/isdn/hisax/nj_s.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/nj_s.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/nj_s.c
+--- a/drivers/isdn/hisax/nj_s.c
++++ b/drivers/isdn/hisax/nj_s.c
@@ -1,4 +1,4 @@
-/* $Id: nj_s.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: nj_s.c,v 2.13 2001/09/24 13:22:56 kai Exp $
cs->readisac = &NETjet_ReadIC;
cs->writeisac = &NETjet_WriteIC;
cs->readisacfifo = &NETjet_ReadICfifo;
-Index: linux-2.4.35.4/drivers/isdn/hisax/nj_u.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/nj_u.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/nj_u.c
+--- a/drivers/isdn/hisax/nj_u.c
++++ b/drivers/isdn/hisax/nj_u.c
@@ -1,4 +1,4 @@
-/* $Id: nj_u.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: nj_u.c,v 2.14 2001/09/24 13:22:56 kai Exp $
if (!cs->hw.njet.base) {
printk(KERN_WARNING "NETspider-U: No IO-Adr for PCI card found\n");
return(0);
-Index: linux-2.4.35.4/drivers/isdn/hisax/q931.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/q931.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/q931.c
+--- a/drivers/isdn/hisax/q931.c
++++ b/drivers/isdn/hisax/q931.c
@@ -1,4 +1,4 @@
-/* $Id: q931.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: q931.c,v 1.12 2001/09/24 13:22:56 kai Exp $
static int
prbits(char *dest, u_char b, int start, int len)
-Index: linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.c
++++ b/drivers/isdn/hisax/rawhdlc.c
@@ -0,0 +1,543 @@
+/* $Id: rawhdlc.c,v 1.7 2001/09/24 13:22:57 kai Exp $
+ *
+}
+
+#endif
-Index: linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.h
++++ b/drivers/isdn/hisax/rawhdlc.h
@@ -0,0 +1,28 @@
+/* $Id: rawhdlc.h,v 1.5 2001/09/24 13:22:57 kai Exp $
+ *
+ u_char *src, u_int slen, u_char *dst, u_int dsize);
+#define RAWHDLC_H
+#endif
-Index: linux-2.4.35.4/drivers/isdn/hisax/s0box.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/s0box.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/s0box.c
+--- a/drivers/isdn/hisax/s0box.c
++++ b/drivers/isdn/hisax/s0box.c
@@ -1,4 +1,4 @@
-/* $Id: s0box.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: s0box.c,v 2.6 2001/09/24 13:22:57 kai Exp $
static inline void
writereg(unsigned int padr, signed int addr, u_char off, u_char val) {
-Index: linux-2.4.35.4/drivers/isdn/hisax/saphir.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/saphir.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/saphir.c
+--- a/drivers/isdn/hisax/saphir.c
++++ b/drivers/isdn/hisax/saphir.c
@@ -1,4 +1,4 @@
-/* $Id: saphir.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: saphir.c,v 1.10 2001/09/24 13:22:57 kai Exp $
#define byteout(addr,val) outb(val,addr)
#define bytein(addr) inb(addr)
-Index: linux-2.4.35.4/drivers/isdn/hisax/sedlbauer.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/sedlbauer.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/sedlbauer.c
+--- a/drivers/isdn/hisax/sedlbauer.c
++++ b/drivers/isdn/hisax/sedlbauer.c
@@ -1,4 +1,4 @@
-/* $Id: sedlbauer.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: sedlbauer.c,v 1.34 2002/02/09 21:00:57 keil Exp $
/* In case of the sedlbauer pcmcia card, this region is in use,
* reserved for us by the card manager. So we do not check it
* here, it would fail.
-Index: linux-2.4.35.4/drivers/isdn/hisax/sportster.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/sportster.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/sportster.c
+--- a/drivers/isdn/hisax/sportster.c
++++ b/drivers/isdn/hisax/sportster.c
@@ -1,4 +1,4 @@
-/* $Id: sportster.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: sportster.c,v 1.16 2001/09/24 13:22:57 kai Exp $
#define byteout(addr,val) outb(val,addr)
#define bytein(addr) inb(addr)
-Index: linux-2.4.35.4/drivers/isdn/hisax/st5481-debug.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/isdn/hisax/st5481-debug.h
++++ b/drivers/isdn/hisax/st5481-debug.h
@@ -0,0 +1,103 @@
+#define ST5481_DEBUG 0x0
+
+
+
+
-Index: linux-2.4.35.4/drivers/isdn/hisax/st5481.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/st5481.h
+--- a/drivers/isdn/hisax/st5481.h
++++ b/drivers/isdn/hisax/st5481.h
@@ -219,15 +219,15 @@ enum {
#define L1_EVENT_COUNT (EV_TIMER3 + 1)
{
int i,j;
int len,ofs;
-Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_b.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_b.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/st5481_b.c
+--- a/drivers/isdn/hisax/st5481_b.c
++++ b/drivers/isdn/hisax/st5481_b.c
@@ -67,28 +67,24 @@ static void usb_b_out(struct st5481_bcs
bytes_sent = buf_size - len;
if (skb->len < bytes_sent)
{
DBG(4,"");
-Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_d.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_d.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/st5481_d.c
+--- a/drivers/isdn/hisax/st5481_d.c
++++ b/drivers/isdn/hisax/st5481_d.c
@@ -162,8 +162,8 @@ static struct FsmNode L1FnList[] __initd
{ST_L1_F8, EV_TIMER3, l1_timer3},
{ST_L1_F8, EV_IND_DP, l1_go_f3},
{
DBG(2,"");
-Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_init.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_init.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/st5481_init.c
+--- a/drivers/isdn/hisax/st5481_init.c
++++ b/drivers/isdn/hisax/st5481_init.c
@@ -14,6 +14,7 @@
* TODO:
*
id_table: st5481_ids,
};
-Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_usb.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c
+--- a/drivers/isdn/hisax/st5481_usb.c
++++ b/drivers/isdn/hisax/st5481_usb.c
@@ -41,9 +41,9 @@ static void usb_next_ctrl_msg(struct urb
(unsigned char *)&ctrl->msg_fifo.data[r_index];
st5481_usb_device_ctrl_msg(in->adapter, in->counter,
in->packet_size,
NULL, NULL);
-Index: linux-2.4.35.4/drivers/isdn/hisax/tei.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/tei.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/tei.c
+--- a/drivers/isdn/hisax/tei.c
++++ b/drivers/isdn/hisax/tei.c
@@ -1,4 +1,4 @@
-/* $Id: tei.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: tei.c,v 2.20 2001/09/24 13:22:57 kai Exp $
#define ID_REQUEST 1
#define ID_ASSIGNED 2
-Index: linux-2.4.35.4/drivers/isdn/hisax/teleint.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/teleint.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/teleint.c
+--- a/drivers/isdn/hisax/teleint.c
++++ b/drivers/isdn/hisax/teleint.c
@@ -1,4 +1,4 @@
-/* $Id: teleint.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: teleint.c,v 1.16 2001/09/24 13:22:57 kai Exp $
#define byteout(addr,val) outb(val,addr)
#define bytein(addr) inb(addr)
-Index: linux-2.4.35.4/drivers/isdn/hisax/teles0.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/teles0.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/teles0.c
+--- a/drivers/isdn/hisax/teles0.c
++++ b/drivers/isdn/hisax/teles0.c
@@ -1,4 +1,4 @@
-/* $Id: teles0.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: teles0.c,v 2.15 2001/09/24 13:22:57 kai Exp $
printk(KERN_INFO
"HiSax: %s config irq:%d mem:0x%lX cfg:0x%X\n",
CardType[cs->typ], cs->irq,
-Index: linux-2.4.35.4/drivers/isdn/hisax/teles3.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/teles3.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/teles3.c
+--- a/drivers/isdn/hisax/teles3.c
++++ b/drivers/isdn/hisax/teles3.c
@@ -1,4 +1,4 @@
-/* $Id: teles3.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: teles3.c,v 2.19 2001/09/24 13:22:57 kai Exp $
if (cs->typ == ISDN_CTYPE_16_3) {
cs->hw.teles3.cfg_reg = card->para[1];
switch (cs->hw.teles3.cfg_reg) {
-Index: linux-2.4.35.4/drivers/isdn/hisax/telespci.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/telespci.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/telespci.c
+--- a/drivers/isdn/hisax/telespci.c
++++ b/drivers/isdn/hisax/telespci.c
@@ -1,4 +1,4 @@
-/* $Id: telespci.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: telespci.c,v 2.23 2001/09/24 13:22:57 kai Exp $
} else {
printk(KERN_WARNING "TelesPCI: No PCI card found\n");
return(0);
-Index: linux-2.4.35.4/drivers/isdn/hisax/w6692.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/w6692.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/w6692.c
+--- a/drivers/isdn/hisax/w6692.c
++++ b/drivers/isdn/hisax/w6692.c
@@ -1,4 +1,4 @@
-/* $Id: w6692.c,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: w6692.c,v 1.18 2001/09/24 13:22:57 kai Exp $
cs->hw.w6692.iobase);
cs->readW6692 = &ReadW6692;
-Index: linux-2.4.35.4/drivers/isdn/hisax/w6692.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/w6692.h
-+++ linux-2.4.35.4/drivers/isdn/hisax/w6692.h
+--- a/drivers/isdn/hisax/w6692.h
++++ b/drivers/isdn/hisax/w6692.h
@@ -1,4 +1,4 @@
-/* $Id: w6692.h,v 1.1.4.1 2001/11/20 14:19:36 kai Exp $
+/* $Id: w6692.h,v 1.4 2001/09/24 13:22:57 kai Exp $
*
* Winbond W6692 specific defines
*
-Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hysdn/boardergo.c
-+++ linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c
+--- a/drivers/isdn/hysdn/boardergo.c
++++ b/drivers/isdn/hysdn/boardergo.c
@@ -1,27 +1,41 @@
-/* $Id: boardergo.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
- *
set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout((50 * HZ) / 1000); /* Timeout 50ms */
} /* wait until timeout */
-Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hysdn/boardergo.h
-+++ linux-2.4.35.4/drivers/isdn/hysdn/boardergo.h
+--- a/drivers/isdn/hysdn/boardergo.h
++++ b/drivers/isdn/hysdn/boardergo.h
@@ -1,4 +1,4 @@
-/* $Id: boardergo.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
/************************************************/
/* defines for the dual port memory of the card */
-Index: linux-2.4.35.4/drivers/isdn/hysdn/hycapi.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hycapi.c
-+++ linux-2.4.35.4/drivers/isdn/hysdn/hycapi.c
+--- a/drivers/isdn/hysdn/hycapi.c
++++ b/drivers/isdn/hysdn/hycapi.c
@@ -1,4 +1,4 @@
-/* $Id: hycapi.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
unsigned int hycapi_enable = 0xffffffff;
MODULE_PARM(hycapi_enable, "i");
-Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_boot.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_boot.c
-+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_boot.c
+--- a/drivers/isdn/hysdn/hysdn_boot.c
++++ b/drivers/isdn/hysdn/hysdn_boot.c
@@ -1,4 +1,4 @@
-/* $Id: hysdn_boot.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
return (boot->last_error); /* error writing data */
if (boot->pof_recoffset + datlen >= boot->pof_reclen)
-Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_defs.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_defs.h
-+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_defs.h
+--- a/drivers/isdn/hysdn/hysdn_defs.h
++++ b/drivers/isdn/hysdn/hysdn_defs.h
@@ -1,4 +1,4 @@
-/* $Id: hysdn_defs.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id: hysdn_defs.h,v 1.10 2001/09/24 13:23:03 kai Exp $
/* boot process */
void *boot; /* pointer to boot private data */
-Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_init.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_init.c
-+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_init.c
+--- a/drivers/isdn/hysdn/hysdn_init.c
++++ b/drivers/isdn/hysdn/hysdn_init.c
@@ -1,4 +1,4 @@
-/* $Id: hysdn_init.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
card->brdtype = BD_NONE; /* unknown */
card->debug_flags = DEF_DEB_FLAGS; /* set default debug */
card->faxchans = 0; /* default no fax channels */
-Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_net.c
-+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c
+--- a/drivers/isdn/hysdn/hysdn_net.c
++++ b/drivers/isdn/hysdn/hysdn_net.c
@@ -1,4 +1,4 @@
-/* $Id: hysdn_net.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
unregister_netdev(dev); /* release the device */
kfree(dev); /* release the memory allocated */
-Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_pof.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_pof.h
-+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_pof.h
+--- a/drivers/isdn/hysdn/hysdn_pof.h
++++ b/drivers/isdn/hysdn/hysdn_pof.h
@@ -1,4 +1,4 @@
-/* $Id: hysdn_pof.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
*
* Linux driver for HYSDN cards, definitions used for handling pof-files.
*
-Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_procconf.c
-+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c
+--- a/drivers/isdn/hysdn/hysdn_procconf.c
++++ b/drivers/isdn/hysdn/hysdn_procconf.c
@@ -1,4 +1,4 @@
-/* $Id: hysdn_procconf.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
hysdn_proclog_init(card); /* init the log file entry */
}
card = card->next; /* next entry */
-Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_proclog.c
-+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c
+--- a/drivers/isdn/hysdn/hysdn_proclog.c
++++ b/drivers/isdn/hysdn/hysdn_proclog.c
@@ -1,4 +1,4 @@
-/* $Id: hysdn_proclog.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
}
init_waitqueue_head(&(pd->rd_queue));
-Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_sched.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_sched.c
-+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_sched.c
+--- a/drivers/isdn/hysdn/hysdn_sched.c
++++ b/drivers/isdn/hysdn/hysdn_sched.c
@@ -1,4 +1,4 @@
-/* $Id: hysdn_sched.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id: hysdn_sched.c,v 1.9 2001/09/24 13:23:03 kai Exp $
if (card->debug_flags & LOG_SCHED_ASYN)
hysdn_addlog(card, "async tx-cfg data send");
-Index: linux-2.4.35.4/drivers/isdn/icn/icn.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/icn/icn.c
-+++ linux-2.4.35.4/drivers/isdn/icn/icn.c
+--- a/drivers/isdn/icn/icn.c
++++ b/drivers/isdn/icn/icn.c
@@ -1,4 +1,4 @@
-/* $Id: icn.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
#endif /* MODULE */
static int __init icn_init(void)
-Index: linux-2.4.35.4/drivers/isdn/icn/icn.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/icn/icn.h
-+++ linux-2.4.35.4/drivers/isdn/icn/icn.h
+--- a/drivers/isdn/icn/icn.h
++++ b/drivers/isdn/icn/icn.h
@@ -1,4 +1,4 @@
-/* $Id: icn.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
*
* ISDN lowlevel-module for the ICN active ISDN-Card.
*
-Index: linux-2.4.35.4/drivers/isdn/isdn_audio.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_audio.c
-+++ linux-2.4.35.4/drivers/isdn/isdn_audio.c
+--- a/drivers/isdn/isdn_audio.c
++++ b/drivers/isdn/isdn_audio.c
@@ -1,9 +1,9 @@
-/* $Id: isdn_audio.c,v 1.1.4.1 2001/11/20 14:19:33 kai Exp $
+/* $Id: isdn_audio.c,v 1.24 2002/08/13 09:57:26 keil Exp $
what = '.';
}
if ((what != s->last) && (what != ' ') && (what != '.')) {
-Index: linux-2.4.35.4/drivers/isdn/isdn_audio.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_audio.h
-+++ linux-2.4.35.4/drivers/isdn/isdn_audio.h
+--- a/drivers/isdn/isdn_audio.h
++++ b/drivers/isdn/isdn_audio.h
@@ -1,4 +1,4 @@
-/* $Id: isdn_audio.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: isdn_audio.h,v 1.10 2001/09/24 13:22:42 kai Exp $
int idx;
int buf[DTMF_NPOINTS];
} dtmf_state;
-Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_bsdcomp.c
-+++ linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c
+--- a/drivers/isdn/isdn_bsdcomp.c
++++ b/drivers/isdn/isdn_bsdcomp.c
@@ -105,6 +105,14 @@ MODULE_LICENSE("Dual BSD/GPL");
#define DEBUG 1
return skb_out->len;
}
-Index: linux-2.4.35.4/drivers/isdn/isdn_common.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_common.c
-+++ linux-2.4.35.4/drivers/isdn/isdn_common.c
+--- a/drivers/isdn/isdn_common.c
++++ b/drivers/isdn/isdn_common.c
@@ -1,4 +1,4 @@
-/* $Id: isdn_common.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: isdn_common.c,v 1.137 2002/02/09 21:19:11 keil Exp $
}
module_init(isdn_init);
-Index: linux-2.4.35.4/drivers/isdn/isdn_common.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_common.h
-+++ linux-2.4.35.4/drivers/isdn/isdn_common.h
+--- a/drivers/isdn/isdn_common.h
++++ b/drivers/isdn/isdn_common.h
@@ -1,4 +1,4 @@
-/* $Id: isdn_common.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: isdn_common.h,v 1.22 2001/09/24 13:22:42 kai Exp $
/* Prototypes */
extern void isdn_MOD_INC_USE_COUNT(void);
extern void isdn_MOD_DEC_USE_COUNT(void);
-Index: linux-2.4.35.4/drivers/isdn/isdn_concap.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_concap.c
-+++ linux-2.4.35.4/drivers/isdn/isdn_concap.c
+--- a/drivers/isdn/isdn_concap.c
++++ b/drivers/isdn/isdn_concap.c
@@ -1,4 +1,4 @@
-/* $Id: isdn_concap.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: isdn_concap.c,v 1.9 2001/09/24 13:22:42 kai Exp $
*
* Linux ISDN subsystem, protocol encapsulation
*
-Index: linux-2.4.35.4/drivers/isdn/isdn_concap.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_concap.h
-+++ linux-2.4.35.4/drivers/isdn/isdn_concap.h
+--- a/drivers/isdn/isdn_concap.h
++++ b/drivers/isdn/isdn_concap.h
@@ -1,4 +1,4 @@
-/* $Id: isdn_concap.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: isdn_concap.h,v 1.4 2001/09/24 13:22:42 kai Exp $
*
* Linux ISDN subsystem, protocol encapsulation
*
-Index: linux-2.4.35.4/drivers/isdn/isdn_dwabc.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/isdn/isdn_dwabc.c
++++ b/drivers/isdn/isdn_dwabc.c
@@ -0,0 +1,1053 @@
+
+/* $Id: isdn_dwabc.c,v 1.27 2001/12/01 23:18:21 detabc Exp $
+{ return(skb); }
+#endif
+#endif
-Index: linux-2.4.35.4/drivers/isdn/isdn_net.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_net.c
-+++ linux-2.4.35.4/drivers/isdn/isdn_net.c
+--- a/drivers/isdn/isdn_net.c
++++ b/drivers/isdn/isdn_net.c
@@ -1,4 +1,4 @@
-/* $Id: isdn_net.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: isdn_net.c,v 1.153 2002/08/17 18:35:23 detabc Exp $
restore_flags(flags);
kfree(p->local);
kfree(p);
-Index: linux-2.4.35.4/drivers/isdn/isdn_net.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_net.h
-+++ linux-2.4.35.4/drivers/isdn/isdn_net.h
+--- a/drivers/isdn/isdn_net.h
++++ b/drivers/isdn/isdn_net.h
@@ -1,4 +1,4 @@
-/* $Id: isdn_net.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: isdn_net.h,v 1.23 2001/11/07 22:35:48 kai Exp $
spin_unlock_irqrestore(&master_lp->netdev->queue_lock, flags);
}
-Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_ppp.c
-+++ linux-2.4.35.4/drivers/isdn/isdn_ppp.c
+--- a/drivers/isdn/isdn_ppp.c
++++ b/drivers/isdn/isdn_ppp.c
@@ -1,4 +1,4 @@
-/* $Id: isdn_ppp.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: isdn_ppp.c,v 1.94 2001/11/07 22:35:48 kai Exp $
printk(KERN_DEBUG "isdn_ppp: Ouch! Master CCP sends on slave slot!\n");
switch(data[2]) {
-Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_ppp.h
-+++ linux-2.4.35.4/drivers/isdn/isdn_ppp.h
+--- a/drivers/isdn/isdn_ppp.h
++++ b/drivers/isdn/isdn_ppp.h
@@ -1,4 +1,4 @@
-/* $Id: isdn_ppp.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: isdn_ppp.h,v 1.18 2001/09/24 13:22:42 kai Exp $
extern int isdn_ppp_xmit(struct sk_buff *, struct net_device *);
extern void isdn_ppp_receive(isdn_net_dev *, isdn_net_local *, struct sk_buff *);
extern int isdn_ppp_dev_ioctl(struct net_device *, struct ifreq *, int);
-Index: linux-2.4.35.4/drivers/isdn/isdn_tty.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_tty.c
-+++ linux-2.4.35.4/drivers/isdn/isdn_tty.c
+--- a/drivers/isdn/isdn_tty.c
++++ b/drivers/isdn/isdn_tty.c
@@ -1,4 +1,4 @@
-/* $Id: isdn_tty.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: isdn_tty.c,v 1.104 2002/02/09 21:19:11 keil Exp $
if (dev->global_features &
ISDN_FEATURE_L3_FCLASS2)
strcat(rs, "2,");
-Index: linux-2.4.35.4/drivers/isdn/isdn_tty.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_tty.h
-+++ linux-2.4.35.4/drivers/isdn/isdn_tty.h
+--- a/drivers/isdn/isdn_tty.h
++++ b/drivers/isdn/isdn_tty.h
@@ -1,4 +1,4 @@
-/* $Id: isdn_tty.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: isdn_tty.h,v 1.25 2002/02/09 21:19:11 keil Exp $
#define TTY_IS_FCLASS2(info) \
((info->emu.mdmreg[REG_L2PROT] == ISDN_PROTO_L2_FAX) && \
(info->emu.mdmreg[REG_L3PROT] == ISDN_PROTO_L3_FCLASS2))
-Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_ttyfax.c
-+++ linux-2.4.35.4/drivers/isdn/isdn_ttyfax.c
+--- a/drivers/isdn/isdn_ttyfax.c
++++ b/drivers/isdn/isdn_ttyfax.c
@@ -1,4 +1,4 @@
-/* $Id: isdn_ttyfax.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: isdn_ttyfax.c,v 1.9 2001/09/24 13:22:43 kai Exp $
+#endif
PARSE_ERROR1;
}
-Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_ttyfax.h
-+++ linux-2.4.35.4/drivers/isdn/isdn_ttyfax.h
+--- a/drivers/isdn/isdn_ttyfax.h
++++ b/drivers/isdn/isdn_ttyfax.h
@@ -1,4 +1,4 @@
-/* $Id: isdn_ttyfax.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: isdn_ttyfax.h,v 1.3 2001/09/24 13:22:43 kai Exp $
*
* header for Linux ISDN subsystem, tty_fax related functions (linklevel).
*
-Index: linux-2.4.35.4/drivers/isdn/isdn_v110.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_v110.c
-+++ linux-2.4.35.4/drivers/isdn/isdn_v110.c
+--- a/drivers/isdn/isdn_v110.c
++++ b/drivers/isdn/isdn_v110.c
@@ -1,4 +1,4 @@
-/* $Id: isdn_v110.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: isdn_v110.c,v 1.8 2001/09/24 13:22:43 kai Exp $
#endif
kfree(v->encodebuf);
kfree(v);
-Index: linux-2.4.35.4/drivers/isdn/isdn_v110.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_v110.h
-+++ linux-2.4.35.4/drivers/isdn/isdn_v110.h
+--- a/drivers/isdn/isdn_v110.h
++++ b/drivers/isdn/isdn_v110.h
@@ -1,4 +1,4 @@
-/* $Id: isdn_v110.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: isdn_v110.h,v 1.5 2001/09/24 13:22:43 kai Exp $
*
* Linux ISDN subsystem, V.110 related functions (linklevel).
*
-Index: linux-2.4.35.4/drivers/isdn/isdn_x25iface.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_x25iface.c
-+++ linux-2.4.35.4/drivers/isdn/isdn_x25iface.c
+--- a/drivers/isdn/isdn_x25iface.c
++++ b/drivers/isdn/isdn_x25iface.c
@@ -1,4 +1,4 @@
-/* $Id: isdn_x25iface.c,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: isdn_x25iface.c,v 1.10 2001/09/24 13:22:43 kai Exp $
*
* Linux ISDN subsystem, X.25 related functions
*
-Index: linux-2.4.35.4/drivers/isdn/isdn_x25iface.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdn_x25iface.h
-+++ linux-2.4.35.4/drivers/isdn/isdn_x25iface.h
+--- a/drivers/isdn/isdn_x25iface.h
++++ b/drivers/isdn/isdn_x25iface.h
@@ -1,4 +1,4 @@
-/* $Id: isdn_x25iface.h,v 1.1.4.1 2001/11/20 14:19:34 kai Exp $
+/* $Id: isdn_x25iface.h,v 1.4 2001/09/24 13:22:43 kai Exp $
*
* header for Linux ISDN subsystem, x.25 related functions
*
-Index: linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdnloop/isdnloop.c
-+++ linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.c
+--- a/drivers/isdn/isdnloop/isdnloop.c
++++ b/drivers/isdn/isdnloop/isdnloop.c
@@ -1,4 +1,4 @@
-/* $Id: isdnloop.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id: isdnloop.c,v 1.17 2001/08/30 10:45:42 kai Exp $
}
static void __exit
-Index: linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/isdnloop/isdnloop.h
-+++ linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.h
+--- a/drivers/isdn/isdnloop/isdnloop.h
++++ b/drivers/isdn/isdnloop/isdnloop.h
@@ -1,4 +1,4 @@
-/* $Id: isdnloop.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
*
* Loopback lowlevel module for testing of linklevel.
*
-Index: linux-2.4.35.4/drivers/isdn/pcbit/callbacks.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/pcbit/callbacks.c
-+++ linux-2.4.35.4/drivers/isdn/pcbit/callbacks.c
+--- a/drivers/isdn/pcbit/callbacks.c
++++ b/drivers/isdn/pcbit/callbacks.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1996 Universidade de Lisboa
*
* This software may be used and distributed according to the terms of
* the GNU General Public License, incorporated herein by reference.
-Index: linux-2.4.35.4/drivers/isdn/pcbit/callbacks.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/pcbit/callbacks.h
-+++ linux-2.4.35.4/drivers/isdn/pcbit/callbacks.h
+--- a/drivers/isdn/pcbit/callbacks.h
++++ b/drivers/isdn/pcbit/callbacks.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 1996 Universidade de Lisboa
*
* This software may be used and distributed according to the terms of
* the GNU General Public License, incorporated herein by reference.
-Index: linux-2.4.35.4/drivers/isdn/pcbit/capi.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/pcbit/capi.c
-+++ linux-2.4.35.4/drivers/isdn/pcbit/capi.c
+--- a/drivers/isdn/pcbit/capi.c
++++ b/drivers/isdn/pcbit/capi.c
@@ -4,7 +4,7 @@
*
* Copyright (C) 1996 Universidade de Lisboa
*
* This software may be used and distributed according to the terms of
* the GNU General Public License, incorporated herein by reference.
-Index: linux-2.4.35.4/drivers/isdn/pcbit/capi.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/pcbit/capi.h
-+++ linux-2.4.35.4/drivers/isdn/pcbit/capi.h
+--- a/drivers/isdn/pcbit/capi.h
++++ b/drivers/isdn/pcbit/capi.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 1996 Universidade de Lisboa
capi_channel(struct pcbit_dev *dev, struct sk_buff *skb)
{
ushort callref;
-Index: linux-2.4.35.4/drivers/isdn/pcbit/drv.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/pcbit/drv.c
-+++ linux-2.4.35.4/drivers/isdn/pcbit/drv.c
+--- a/drivers/isdn/pcbit/drv.c
++++ b/drivers/isdn/pcbit/drv.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1996 Universidade de Lisboa
if (capi_decode_conn_conf(chan, skb, &complete)) {
printk(KERN_DEBUG "conn_conf indicates error\n");
pcbit_fsm_event(dev, chan, EV_ERROR, NULL);
-Index: linux-2.4.35.4/drivers/isdn/pcbit/edss1.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/pcbit/edss1.c
-+++ linux-2.4.35.4/drivers/isdn/pcbit/edss1.c
+--- a/drivers/isdn/pcbit/edss1.c
++++ b/drivers/isdn/pcbit/edss1.c
@@ -4,7 +4,7 @@
*
* Copyright (C) 1996 Universidade de Lisboa
*
* This software may be used and distributed according to the terms of
* the GNU General Public License, incorporated herein by reference.
-Index: linux-2.4.35.4/drivers/isdn/pcbit/edss1.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/pcbit/edss1.h
-+++ linux-2.4.35.4/drivers/isdn/pcbit/edss1.h
+--- a/drivers/isdn/pcbit/edss1.h
++++ b/drivers/isdn/pcbit/edss1.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 1996 Universidade de Lisboa
*
* This software may be used and distributed according to the terms of
* the GNU General Public License, incorporated herein by reference.
-Index: linux-2.4.35.4/drivers/isdn/pcbit/layer2.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/pcbit/layer2.c
-+++ linux-2.4.35.4/drivers/isdn/pcbit/layer2.c
+--- a/drivers/isdn/pcbit/layer2.c
++++ b/drivers/isdn/pcbit/layer2.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1996 Universidade de Lisboa
return;
}
-Index: linux-2.4.35.4/drivers/isdn/pcbit/layer2.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/pcbit/layer2.h
-+++ linux-2.4.35.4/drivers/isdn/pcbit/layer2.h
+--- a/drivers/isdn/pcbit/layer2.h
++++ b/drivers/isdn/pcbit/layer2.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 1996 Universidade de Lisboa
*
* This software may be used and distributed according to the terms of
* the GNU General Public License, incorporated herein by reference.
-Index: linux-2.4.35.4/drivers/isdn/pcbit/module.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/pcbit/module.c
-+++ linux-2.4.35.4/drivers/isdn/pcbit/module.c
+--- a/drivers/isdn/pcbit/module.c
++++ b/drivers/isdn/pcbit/module.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1996 Universidade de Lisboa
#endif
module_init(pcbit_init);
-Index: linux-2.4.35.4/drivers/isdn/pcbit/pcbit.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/pcbit/pcbit.h
-+++ linux-2.4.35.4/drivers/isdn/pcbit/pcbit.h
+--- a/drivers/isdn/pcbit/pcbit.h
++++ b/drivers/isdn/pcbit/pcbit.h
@@ -3,7 +3,7 @@
*
* Copyright (C) 1996 Universidade de Lisboa
*
* This software may be used and distributed according to the terms of
* the GNU General Public License, incorporated herein by reference.
-Index: linux-2.4.35.4/drivers/isdn/sc/card.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/sc/card.h
-+++ linux-2.4.35.4/drivers/isdn/sc/card.h
+--- a/drivers/isdn/sc/card.h
++++ b/drivers/isdn/sc/card.h
@@ -1,4 +1,4 @@
-/* $Id: card.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
*
* Driver parameters for SpellCaster ISA ISDN adapters
*
-Index: linux-2.4.35.4/drivers/isdn/sc/command.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/sc/command.c
-+++ linux-2.4.35.4/drivers/isdn/sc/command.c
+--- a/drivers/isdn/sc/command.c
++++ b/drivers/isdn/sc/command.c
@@ -1,4 +1,4 @@
-/* $Id: command.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
}
/*
-Index: linux-2.4.35.4/drivers/isdn/sc/debug.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/sc/debug.c
-+++ linux-2.4.35.4/drivers/isdn/sc/debug.c
+--- a/drivers/isdn/sc/debug.c
++++ b/drivers/isdn/sc/debug.c
@@ -1,4 +1,4 @@
-/* $Id: debug.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
*
* Copyright (C) 1996 SpellCaster Telecommunications Inc.
*
-Index: linux-2.4.35.4/drivers/isdn/sc/debug.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/sc/debug.h
-+++ linux-2.4.35.4/drivers/isdn/sc/debug.h
+--- a/drivers/isdn/sc/debug.h
++++ b/drivers/isdn/sc/debug.h
@@ -1,4 +1,4 @@
-/* $Id: debug.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
*
* Copyright (C) 1996 SpellCaster Telecommunications Inc.
*
-Index: linux-2.4.35.4/drivers/isdn/sc/event.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/sc/event.c
-+++ linux-2.4.35.4/drivers/isdn/sc/event.c
+--- a/drivers/isdn/sc/event.c
++++ b/drivers/isdn/sc/event.c
@@ -1,4 +1,4 @@
-/* $Id: event.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
*
* Copyright (C) 1996 SpellCaster Telecommunications Inc.
*
-Index: linux-2.4.35.4/drivers/isdn/sc/init.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/sc/init.c
-+++ linux-2.4.35.4/drivers/isdn/sc/init.c
+--- a/drivers/isdn/sc/init.c
++++ b/drivers/isdn/sc/init.c
@@ -514,6 +514,15 @@ int identify_board(unsigned long rambase
schedule_timeout(HZ);
sig = readl(rambase + SIG_OFFSET);
if(sig == SIGNATURE)
return BRI_BOARD;
-Index: linux-2.4.35.4/drivers/isdn/sc/interrupt.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/sc/interrupt.c
-+++ linux-2.4.35.4/drivers/isdn/sc/interrupt.c
+--- a/drivers/isdn/sc/interrupt.c
++++ b/drivers/isdn/sc/interrupt.c
@@ -1,4 +1,4 @@
-/* $Id: interrupt.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
*
* Copyright (C) 1996 SpellCaster Telecommunications Inc.
*
-Index: linux-2.4.35.4/drivers/isdn/sc/ioctl.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/sc/ioctl.c
-+++ linux-2.4.35.4/drivers/isdn/sc/ioctl.c
+--- a/drivers/isdn/sc/ioctl.c
++++ b/drivers/isdn/sc/ioctl.c
@@ -23,6 +23,9 @@ extern int send_and_receive(int, unsigne
extern board *adapter[];
int GetStatus(int card, boardInfo *);
-Index: linux-2.4.35.4/drivers/isdn/sc/message.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/sc/message.c
-+++ linux-2.4.35.4/drivers/isdn/sc/message.c
+--- a/drivers/isdn/sc/message.c
++++ b/drivers/isdn/sc/message.c
@@ -1,4 +1,4 @@
-/* $Id: message.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
*
* functions for sending and receiving control messages
*
-Index: linux-2.4.35.4/drivers/isdn/sc/message.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/sc/message.h
-+++ linux-2.4.35.4/drivers/isdn/sc/message.h
+--- a/drivers/isdn/sc/message.h
++++ b/drivers/isdn/sc/message.h
@@ -1,4 +1,4 @@
-/* $Id: message.h,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
*
* Copyright (C) 1996 SpellCaster Telecommunications Inc.
*
-Index: linux-2.4.35.4/drivers/isdn/sc/packet.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/sc/packet.c
-+++ linux-2.4.35.4/drivers/isdn/sc/packet.c
+--- a/drivers/isdn/sc/packet.c
++++ b/drivers/isdn/sc/packet.c
@@ -1,4 +1,4 @@
-/* $Id: packet.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
*
* Copyright (C) 1996 SpellCaster Telecommunications Inc.
*
-Index: linux-2.4.35.4/drivers/isdn/sc/shmem.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/sc/shmem.c
-+++ linux-2.4.35.4/drivers/isdn/sc/shmem.c
+--- a/drivers/isdn/sc/shmem.c
++++ b/drivers/isdn/sc/shmem.c
@@ -1,4 +1,4 @@
-/* $Id: shmem.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
*
* Copyright (C) 1996 SpellCaster Telecommunications Inc.
*
-Index: linux-2.4.35.4/drivers/isdn/sc/timer.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/sc/timer.c
-+++ linux-2.4.35.4/drivers/isdn/sc/timer.c
+--- a/drivers/isdn/sc/timer.c
++++ b/drivers/isdn/sc/timer.c
@@ -1,4 +1,4 @@
-/* $Id: timer.c,v 1.1.4.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
*
* Copyright (C) 1996 SpellCaster Telecommunications Inc.
*
-Index: linux-2.4.35.4/drivers/isdn/tpam/tpam.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam.h
-+++ linux-2.4.35.4/drivers/isdn/tpam/tpam.h
+--- a/drivers/isdn/tpam/tpam.h
++++ b/drivers/isdn/tpam/tpam.h
@@ -1,4 +1,4 @@
-/* $Id: tpam.h,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $
+/* $Id: tpam.h,v 1.3 2001/09/24 13:23:12 kai Exp $
*
* Turbo PAM ISDN driver for Linux. (Kernel Driver)
*
-Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_commands.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_commands.c
-+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_commands.c
+--- a/drivers/isdn/tpam/tpam_commands.c
++++ b/drivers/isdn/tpam/tpam_commands.c
@@ -1,4 +1,4 @@
-/* $Id: tpam_commands.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $
+/* $Id: tpam_commands.c,v 1.3 2001/09/24 13:23:12 kai Exp $
*
* Turbo PAM ISDN driver for Linux. (Kernel Driver - ISDN commands)
*
-Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_crcpc.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_crcpc.c
-+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_crcpc.c
+--- a/drivers/isdn/tpam/tpam_crcpc.c
++++ b/drivers/isdn/tpam/tpam_crcpc.c
@@ -1,4 +1,4 @@
-/* $Id: tpam_crcpc.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
*
* Turbo PAM ISDN driver for Linux. (Kernel Driver - CRC encoding)
*
-Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_hdlc.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_hdlc.c
-+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_hdlc.c
+--- a/drivers/isdn/tpam/tpam_hdlc.c
++++ b/drivers/isdn/tpam/tpam_hdlc.c
@@ -1,4 +1,4 @@
-/* $Id: tpam_hdlc.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $
+/* $Id: tpam_hdlc.c,v 1.3 2001/09/24 13:23:12 kai Exp $
*
* Turbo PAM ISDN driver for Linux. (Kernel Driver - HDLC encoding)
*
-Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_main.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_main.c
-+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_main.c
+--- a/drivers/isdn/tpam/tpam_main.c
++++ b/drivers/isdn/tpam/tpam_main.c
@@ -1,4 +1,4 @@
-/* $Id: tpam_main.c,v 1.1.2.2 2001/12/09 18:45:14 kai Exp $
+/* $Id$
};
static int __init tpam_init(void) {
-Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_memory.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_memory.c
-+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_memory.c
+--- a/drivers/isdn/tpam/tpam_memory.c
++++ b/drivers/isdn/tpam/tpam_memory.c
@@ -1,4 +1,4 @@
-/* $Id: tpam_memory.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
*
* Turbo PAM ISDN driver for Linux. (Kernel Driver - Board Memory Access)
*
-Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_nco.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_nco.c
-+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_nco.c
+--- a/drivers/isdn/tpam/tpam_nco.c
++++ b/drivers/isdn/tpam/tpam_nco.c
@@ -1,4 +1,4 @@
-/* $Id: tpam_nco.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
*
* Turbo PAM ISDN driver for Linux.
* (Kernel Driver - Low Level NCO Manipulation)
-Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_queues.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_queues.c
-+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_queues.c
+--- a/drivers/isdn/tpam/tpam_queues.c
++++ b/drivers/isdn/tpam/tpam_queues.c
@@ -1,4 +1,4 @@
-/* $Id: tpam_queues.c,v 1.1.2.1 2001/11/20 14:19:37 kai Exp $
+/* $Id$
spin_unlock(&card->lock);
printk(KERN_ERR "TurboPAM(tpam_irq): "
"waiting too long...\n");
-Index: linux-2.4.35.4/include/linux/b1lli.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/b1lli.h
-+++ linux-2.4.35.4/include/linux/b1lli.h
+--- a/include/linux/b1lli.h
++++ b/include/linux/b1lli.h
@@ -1,4 +1,4 @@
-/* $Id: b1lli.h,v 1.8.8.3 2001/09/23 22:25:05 kai Exp $
+/* $Id$
*
* ISDN lowlevel-module for AVM B1-card.
*
-Index: linux-2.4.35.4/include/linux/b1pcmcia.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/b1pcmcia.h
-+++ linux-2.4.35.4/include/linux/b1pcmcia.h
+--- a/include/linux/b1pcmcia.h
++++ b/include/linux/b1pcmcia.h
@@ -1,4 +1,4 @@
-/* $Id: b1pcmcia.h,v 1.1.8.2 2001/09/23 22:25:05 kai Exp $
+/* $Id$
*
* Exported functions of module b1pcmcia to be called by
* avm_cs card services module.
-Index: linux-2.4.35.4/include/linux/capi.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/capi.h
-+++ linux-2.4.35.4/include/linux/capi.h
+--- a/include/linux/capi.h
++++ b/include/linux/capi.h
@@ -1,4 +1,4 @@
-/* $Id: capi.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $
+/* $Id$
*
* CAPI 2.0 Interface for Linux
*
-Index: linux-2.4.35.4/include/linux/concap.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/concap.h
-+++ linux-2.4.35.4/include/linux/concap.h
+--- a/include/linux/concap.h
++++ b/include/linux/concap.h
@@ -1,4 +1,4 @@
-/* $Id: concap.h,v 1.2.8.1 2001/09/23 22:25:05 kai Exp $
+/* $Id: concap.h,v 1.3 2001/09/24 13:23:13 kai Exp $
/* Stuff to support encapsulation protocols genericly. The encapsulation
protocol is processed at the uppermost layer of the network interface.
-Index: linux-2.4.35.4/include/linux/hysdn_if.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/hysdn_if.h
-+++ linux-2.4.35.4/include/linux/hysdn_if.h
+--- a/include/linux/hysdn_if.h
++++ b/include/linux/hysdn_if.h
@@ -1,4 +1,4 @@
-/* $Id: hysdn_if.h,v 1.1.8.3 2001/09/23 22:25:05 kai Exp $
+/* $Id$
*
* Linux driver for HYSDN cards
* ioctl definitions shared by hynetmgr and driver.
-Index: linux-2.4.35.4/include/linux/isdn/tpam.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/isdn/tpam.h
-+++ linux-2.4.35.4/include/linux/isdn/tpam.h
+--- a/include/linux/isdn/tpam.h
++++ b/include/linux/isdn/tpam.h
@@ -1,4 +1,4 @@
-/* $Id: tpam.h,v 1.1.2.1 2001/11/20 14:19:38 kai Exp $
+/* $Id$
*
* Turbo PAM ISDN driver for Linux. (Kernel Driver)
*
-Index: linux-2.4.35.4/include/linux/isdn.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/isdn.h
-+++ linux-2.4.35.4/include/linux/isdn.h
+--- a/include/linux/isdn.h
++++ b/include/linux/isdn.h
@@ -1,4 +1,4 @@
-/* $Id: isdn.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $
+/* $Id: isdn.h,v 1.125 2001/12/01 23:18:21 detabc Exp $
#endif /* __KERNEL__ */
-Index: linux-2.4.35.4/include/linux/isdn_compat.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/isdn_compat.h
++++ b/include/linux/isdn_compat.h
@@ -0,0 +1,261 @@
+/* $Id: isdn_compat.h,v 1.53 2001/09/24 13:23:13 kai Exp $
+ *
+
+#endif /* __KERNEL__ */
+#endif /* _LINUX_ISDN_COMPAT_H */
-Index: linux-2.4.35.4/include/linux/isdn_divertif.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/isdn_divertif.h
-+++ linux-2.4.35.4/include/linux/isdn_divertif.h
+--- a/include/linux/isdn_divertif.h
++++ b/include/linux/isdn_divertif.h
@@ -1,4 +1,4 @@
-/* $Id: isdn_divertif.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $
+/* $Id$
} isdn_divert_if;
/*********************/
-Index: linux-2.4.35.4/include/linux/isdn_dwabc.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/isdn_dwabc.h
++++ b/include/linux/isdn_dwabc.h
@@ -0,0 +1,84 @@
+/* $Id: isdn_dwabc.h,v 1.9 2001/09/26 20:32:08 detabc Exp $
+ *
+};
+
+#endif
-Index: linux-2.4.35.4/include/linux/isdn_lzscomp.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/isdn_lzscomp.h
-+++ linux-2.4.35.4/include/linux/isdn_lzscomp.h
+--- a/include/linux/isdn_lzscomp.h
++++ b/include/linux/isdn_lzscomp.h
@@ -1,4 +1,4 @@
-/* $Id: isdn_lzscomp.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $
+/* $Id$
*
* Header for isdn_lzscomp.c
* Concentrated here to not mess up half a dozen kernel headers with code
-Index: linux-2.4.35.4/include/linux/isdn_ppp.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/isdn_ppp.h
-+++ linux-2.4.35.4/include/linux/isdn_ppp.h
+--- a/include/linux/isdn_ppp.h
++++ b/include/linux/isdn_ppp.h
@@ -8,6 +8,7 @@
#ifndef _LINUX_ISDN_PPP_H
#define _LINUX_ISDN_PPP_H
unsigned long debug;
struct isdn_ppp_compressor *compressor,*decompressor;
struct isdn_ppp_compressor *link_compressor,*link_decompressor;
-Index: linux-2.4.35.4/include/linux/isdnif.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/isdnif.h
-+++ linux-2.4.35.4/include/linux/isdnif.h
+--- a/include/linux/isdnif.h
++++ b/include/linux/isdnif.h
@@ -1,4 +1,4 @@
-/* $Id: isdnif.h,v 1.1.4.1 2001/11/20 14:19:38 kai Exp $
+/* $Id: isdnif.h,v 1.43 2002/02/09 21:19:11 keil Exp $
/*
* Audio commands
-Index: linux-2.4.35.4/include/linux/kernelcapi.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/kernelcapi.h
-+++ linux-2.4.35.4/include/linux/kernelcapi.h
+--- a/include/linux/kernelcapi.h
++++ b/include/linux/kernelcapi.h
@@ -1,12 +1,10 @@
-/* $Id: kernelcapi.h,v 1.1.4.2 2002/01/28 18:25:10 kai Exp $
+/*
-Index: linux-2.4.35.4/drivers/Makefile
-===================================================================
---- linux-2.4.35.4.orig/drivers/Makefile
-+++ linux-2.4.35.4/drivers/Makefile
+--- a/drivers/Makefile
++++ b/drivers/Makefile
@@ -38,7 +38,7 @@ subdir-$(CONFIG_FUSION) += message/fusi
subdir-$(CONFIG_MD) += md
subdir-$(CONFIG_IEEE1394) += ieee1394
subdir-$(CONFIG_ATM) += atm
subdir-$(CONFIG_FC4) += fc4
-Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_usb.c
-+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c
+--- a/drivers/isdn/hisax/hfc_usb.c
++++ b/drivers/isdn/hisax/hfc_usb.c
@@ -1,13 +1,11 @@
-/* $Id: hfc_usb.c,v 2.3 2001/07/06 21:30:11 werner Exp $
+/*
-Index: linux-2.4.35.4/drivers/usb/serial/pl2303.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/serial/pl2303.c
-+++ linux-2.4.35.4/drivers/usb/serial/pl2303.c
+--- a/drivers/usb/serial/pl2303.c
++++ b/drivers/usb/serial/pl2303.c
@@ -78,6 +78,11 @@ static struct usb_device_id id_table []
{ USB_DEVICE(RADIOSHACK_VENDOR_ID, RADIOSHACK_PRODUCT_ID) },
{ USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) },
{ } /* Terminating entry */
};
-Index: linux-2.4.35.4/drivers/usb/serial/pl2303.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/serial/pl2303.h
-+++ linux-2.4.35.4/drivers/usb/serial/pl2303.h
+--- a/drivers/usb/serial/pl2303.h
++++ b/drivers/usb/serial/pl2303.h
@@ -41,3 +41,21 @@
#define SITECOM_VENDOR_ID 0x6189
-Index: linux-2.4.35.4/fs/hfsplus/super.c
-===================================================================
---- linux-2.4.35.4.orig/fs/hfsplus/super.c
-+++ linux-2.4.35.4/fs/hfsplus/super.c
+--- a/fs/hfsplus/super.c
++++ b/fs/hfsplus/super.c
@@ -240,8 +240,7 @@ int hfsplus_remount(struct super_block *
if (!(*flags & MS_RDONLY)) {
struct hfsplus_vh *vhdr = HFSPLUS_SB(sb).s_vhdr;
-Index: linux-2.4.35.4/arch/mips/kernel/signal.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/signal.c
-+++ linux-2.4.35.4/arch/mips/kernel/signal.c
+--- a/arch/mips/kernel/signal.c
++++ b/arch/mips/kernel/signal.c
@@ -6,8 +6,10 @@
* Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 1994 - 1999 Ralf Baechle
{
sigset_t *unewset, saveset, newset;
size_t sigsetsize;
-Index: linux-2.4.35.4/arch/mips/kernel/syscall.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/syscall.c
-+++ linux-2.4.35.4/arch/mips/kernel/syscall.c
+--- a/arch/mips/kernel/syscall.c
++++ b/arch/mips/kernel/syscall.c
@@ -5,6 +5,7 @@
*
* Copyright (C) 1995 - 2000 by Ralf Baechle
{
unsigned long clone_flags;
unsigned long newsp;
-Index: linux-2.4.35.4/arch/mips/ld.script.in
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/ld.script.in
-+++ linux-2.4.35.4/arch/mips/ld.script.in
+--- a/arch/mips/ld.script.in
++++ b/arch/mips/ld.script.in
@@ -9,6 +9,7 @@ SECTIONS
{
_ftext = . ;
*(.rodata)
*(.rodata.*)
*(.rodata1)
-Index: linux-2.4.35.4/arch/mips64/kernel/signal.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/kernel/signal.c
-+++ linux-2.4.35.4/arch/mips64/kernel/signal.c
+--- a/arch/mips64/kernel/signal.c
++++ b/arch/mips64/kernel/signal.c
@@ -6,8 +6,10 @@
* Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 1994 - 2000 Ralf Baechle
{
sigset_t *unewset, saveset, newset;
size_t sigsetsize;
-Index: linux-2.4.35.4/arch/mips64/kernel/signal32.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/kernel/signal32.c
-+++ linux-2.4.35.4/arch/mips64/kernel/signal32.c
+--- a/arch/mips64/kernel/signal32.c
++++ b/arch/mips64/kernel/signal32.c
@@ -6,7 +6,9 @@
* Copyright (C) 1991, 1992 Linus Torvalds
* Copyright (C) 1994 - 2000 Ralf Baechle
{
sigset32_t *uset;
sigset_t newset, saveset;
-Index: linux-2.4.35.4/arch/mips64/kernel/syscall.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips64/kernel/syscall.c
-+++ linux-2.4.35.4/arch/mips64/kernel/syscall.c
+--- a/arch/mips64/kernel/syscall.c
++++ b/arch/mips64/kernel/syscall.c
@@ -6,7 +6,9 @@
* Copyright (C) 1995 - 2000, 2001 by Ralf Baechle
* Copyright (C) 1999, 2000 Silicon Graphics, Inc.
{
unsigned long clone_flags;
unsigned long newsp;
-Index: linux-2.4.35.4/include/asm-mips/ptrace.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips/ptrace.h
-+++ linux-2.4.35.4/include/asm-mips/ptrace.h
+--- a/include/asm-mips/ptrace.h
++++ b/include/asm-mips/ptrace.h
@@ -4,6 +4,7 @@
* for more details.
*
#endif /* !__ASSEMBLY__ */
/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
-Index: linux-2.4.35.4/include/asm-mips64/ptrace.h
-===================================================================
---- linux-2.4.35.4.orig/include/asm-mips64/ptrace.h
-+++ linux-2.4.35.4/include/asm-mips64/ptrace.h
+--- a/include/asm-mips64/ptrace.h
++++ b/include/asm-mips64/ptrace.h
@@ -5,6 +5,7 @@
*
* Copyright (C) 1994, 95, 96, 97, 98, 99, 2000 by Ralf Baechle
-Index: linux-2.4.35.4/drivers/usb/host/ehci-q.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/host/ehci-q.c
-+++ linux-2.4.35.4/drivers/usb/host/ehci-q.c
+--- a/drivers/usb/host/ehci-q.c
++++ b/drivers/usb/host/ehci-q.c
@@ -782,6 +782,11 @@ static void qh_link_async (struct ehci_h
if (!(cmd & CMD_ASE)) {
/* in case a clear of CMD_ASE didn't take yet */
-Index: linux-2.4.35.4/Makefile
-===================================================================
---- linux-2.4.35.4.orig/Makefile
-+++ linux-2.4.35.4/Makefile
+--- a/Makefile
++++ b/Makefile
@@ -362,7 +362,7 @@ include/linux/compile.h: $(CONFIGURATION
@rm -f .ver1
scripts/mkdep -- init/*.c > .depend
ifdef CONFIG_MODVERSIONS
-Index: linux-2.4.35.4/Rules.make
-===================================================================
---- linux-2.4.35.4.orig/Rules.make
-+++ linux-2.4.35.4/Rules.make
+--- a/Rules.make
++++ b/Rules.make
@@ -126,7 +126,7 @@ endif
# This make dependencies quickly
#
-Index: linux-2.4.35.4/drivers/char/serial.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/char/serial.c
-+++ linux-2.4.35.4/drivers/char/serial.c
+--- a/drivers/char/serial.c
++++ b/drivers/char/serial.c
@@ -5458,18 +5458,6 @@ static int __init rs_init(void)
sizeof(struct rs_multiport_struct));
#endif
-Index: linux-2.4.35.4/net/sched/sch_htb.c
-===================================================================
---- linux-2.4.35.4.orig/net/sched/sch_htb.c
-+++ linux-2.4.35.4/net/sched/sch_htb.c
+--- a/net/sched/sch_htb.c
++++ b/net/sched/sch_htb.c
@@ -369,7 +369,7 @@ static void htb_debug_dump (struct htb_s
struct list_head *l;
list_for_each (l,q->hash+i) {
-Index: linux-2.4.35.4/net/sched/sch_htb.c
-===================================================================
---- linux-2.4.35.4.orig/net/sched/sch_htb.c
-+++ linux-2.4.35.4/net/sched/sch_htb.c
+--- a/net/sched/sch_htb.c
++++ b/net/sched/sch_htb.c
@@ -74,7 +74,7 @@
#define HTB_EWMAC 2 /* rate average over HTB_EWMAC*HTB_HSIZE sec */
#define HTB_DEBUG 1 /* compile debugging support (activated by tc tool) */
-Index: linux-2.4.35.4/drivers/sound/sound_core.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/sound/sound_core.c
-+++ linux-2.4.35.4/drivers/sound/sound_core.c
+--- a/drivers/sound/sound_core.c
++++ b/drivers/sound/sound_core.c
@@ -174,9 +174,9 @@ static int sound_insert_unit(struct soun
}
-Index: linux-2.4.35.4/include/linux/atmdev.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/atmdev.h
-+++ linux-2.4.35.4/include/linux/atmdev.h
+--- a/include/linux/atmdev.h
++++ b/include/linux/atmdev.h
@@ -400,6 +400,7 @@ extern rwlock_t vcc_sklist_lock;
struct atm_dev *atm_dev_register(const char *type,const struct atmdev_ops *ops,
int number,atm_dev_flags_t *flags); /* number == -1: pick first available */
void atm_dev_deregister(struct atm_dev *dev);
void shutdown_atm_dev(struct atm_dev *dev);
void vcc_insert_socket(struct sock *sk);
-Index: linux-2.4.35.4/net/atm/resources.c
-===================================================================
---- linux-2.4.35.4.orig/net/atm/resources.c
-+++ linux-2.4.35.4/net/atm/resources.c
+--- a/net/atm/resources.c
++++ b/net/atm/resources.c
@@ -10,6 +10,7 @@
#include <linux/sonet.h>
#include <linux/kernel.h> /* for barrier */
-Index: linux-2.4.35.4/lib/string.c
-===================================================================
---- linux-2.4.35.4.orig/lib/string.c
-+++ linux-2.4.35.4/lib/string.c
+--- a/lib/string.c
++++ b/lib/string.c
@@ -50,6 +50,7 @@ int strnicmp(const char *s1, const char
}
return (int)c1 - (int)c2;
-Index: linux-2.4.35.4/net/atm/br2684.c
-===================================================================
---- linux-2.4.35.4.orig/net/atm/br2684.c
-+++ linux-2.4.35.4/net/atm/br2684.c
+--- a/net/atm/br2684.c
++++ b/net/atm/br2684.c
@@ -55,36 +55,55 @@ static void skb_debug(const struct sk_bu
#define skb_debug(skb) do {} while (0)
#endif
while (!list_empty(&br2684_devs)) {
brdev = list_entry_brdev(br2684_devs.next);
unregister_netdev(&brdev->net_dev);
-Index: linux-2.4.35.4/net/atm/common.c
-===================================================================
---- linux-2.4.35.4.orig/net/atm/common.c
-+++ linux-2.4.35.4/net/atm/common.c
+--- a/net/atm/common.c
++++ b/net/atm/common.c
@@ -158,6 +158,7 @@ void br2684_ioctl_set(int (*hook)(struct
}
#ifdef CONFIG_ATM_BR2684_MODULE
#endif
#endif
-Index: linux-2.4.35.4/include/linux/atmbr2684.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/atmbr2684.h
-+++ linux-2.4.35.4/include/linux/atmbr2684.h
+--- a/include/linux/atmbr2684.h
++++ b/include/linux/atmbr2684.h
@@ -3,6 +3,7 @@
#include <linux/atm.h>
-Index: linux-2.4.35.4/fs/jffs2/build.c
-===================================================================
---- linux-2.4.35.4.orig/fs/jffs2/build.c
-+++ linux-2.4.35.4/fs/jffs2/build.c
+--- a/fs/jffs2/build.c
++++ b/fs/jffs2/build.c
@@ -31,6 +31,10 @@
* provisions above, a recipient may use your version of this file
* under either the RHEPL or the GPL.
D1(printk(KERN_DEBUG "Scanned flash completely\n"));
/* Now build the data map for each inode, marking obsoleted nodes
as such, and also increase nlink of any children. */
-Index: linux-2.4.35.4/fs/jffs2/scan.c
-===================================================================
---- linux-2.4.35.4.orig/fs/jffs2/scan.c
-+++ linux-2.4.35.4/fs/jffs2/scan.c
+--- a/fs/jffs2/scan.c
++++ b/fs/jffs2/scan.c
@@ -31,6 +31,10 @@
* provisions above, a recipient may use your version of this file
* under either the RHEPL or the GPL.
-Index: linux-2.4.35.4/drivers/scsi/hosts.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/scsi/hosts.c
-+++ linux-2.4.35.4/drivers/scsi/hosts.c
+--- a/drivers/scsi/hosts.c
++++ b/drivers/scsi/hosts.c
@@ -107,8 +107,21 @@ scsi_unregister(struct Scsi_Host * sh){
if (shn) shn->host_registered = 0;
/* else {} : This should not happen, we should panic here... */
kfree((char *) sh);
}
-Index: linux-2.4.35.4/drivers/usb/hcd.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/hcd.c
-+++ linux-2.4.35.4/drivers/usb/hcd.c
+--- a/drivers/usb/hcd.c
++++ b/drivers/usb/hcd.c
@@ -1105,7 +1105,8 @@ static int hcd_submit_urb (struct urb *u
break;
case PIPE_BULK:
urb->transfer_dma = pci_map_single (
hcd->pdev,
urb->transfer_buffer,
-Index: linux-2.4.35.4/drivers/usb/host/ehci-hcd.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/host/ehci-hcd.c
-+++ linux-2.4.35.4/drivers/usb/host/ehci-hcd.c
+--- a/drivers/usb/host/ehci-hcd.c
++++ b/drivers/usb/host/ehci-hcd.c
@@ -399,6 +399,27 @@ static int ehci_start (struct usb_hcd *h
ehci_mem_cleanup (ehci);
return retval;
writel (INTR_MASK, &ehci->regs->intr_enable);
writel (ehci->periodic_dma, &ehci->regs->frame_list);
-Index: linux-2.4.35.4/drivers/usb/host/ehci-q.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/host/ehci-q.c
-+++ linux-2.4.35.4/drivers/usb/host/ehci-q.c
+--- a/drivers/usb/host/ehci-q.c
++++ b/drivers/usb/host/ehci-q.c
@@ -791,6 +791,8 @@ static void qh_link_async (struct ehci_h
writel (cmd, &ehci->regs->command);
ehci->hcd.state = USB_STATE_RUNNING;
}
}
-Index: linux-2.4.35.4/drivers/usb/host/usb-uhci.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/host/usb-uhci.c
-+++ linux-2.4.35.4/drivers/usb/host/usb-uhci.c
+--- a/drivers/usb/host/usb-uhci.c
++++ b/drivers/usb/host/usb-uhci.c
@@ -3034,6 +3034,21 @@ uhci_pci_probe (struct pci_dev *dev, con
pci_set_master(dev);
/* Search for the IO base address.. */
for (i = 0; i < 6; i++) {
-Index: linux-2.4.35.4/drivers/usb/storage/transport.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/storage/transport.c
-+++ linux-2.4.35.4/drivers/usb/storage/transport.c
+--- a/drivers/usb/storage/transport.c
++++ b/drivers/usb/storage/transport.c
@@ -54,6 +54,22 @@
#include <linux/sched.h>
#include <linux/errno.h>
}
}
else
-Index: linux-2.4.35.4/drivers/usb/storage/transport.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/storage/transport.h
-+++ linux-2.4.35.4/drivers/usb/storage/transport.h
+--- a/drivers/usb/storage/transport.h
++++ b/drivers/usb/storage/transport.h
@@ -127,6 +127,16 @@ struct bulk_cs_wrap {
#define US_BULK_TRANSFER_ABORTED 3 /* transfer canceled */
* Transport return codes
*/
-Index: linux-2.4.35.4/drivers/usb/storage/usb.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/storage/usb.h
-+++ linux-2.4.35.4/drivers/usb/storage/usb.h
+--- a/drivers/usb/storage/usb.h
++++ b/drivers/usb/storage/usb.h
@@ -111,6 +111,60 @@ typedef int (*trans_reset)(struct us_dat
typedef void (*proto_cmnd)(Scsi_Cmnd*, struct us_data*);
typedef void (*extra_data_destructor)(void *); /* extra data destructor */
/* the semaphore for sleeping the control thread */
struct semaphore sema; /* to sleep thread on */
-Index: linux-2.4.35.4/include/linux/usb.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/usb.h
-+++ linux-2.4.35.4/include/linux/usb.h
+--- a/include/linux/usb.h
++++ b/include/linux/usb.h
@@ -483,6 +483,8 @@ struct usb_driver {
#define URB_NO_INTERRUPT 0x0080 /* HINT: no non-error interrupt needed */
/* ... less overhead for QUEUE_BULK */
-Index: linux-2.4.35.4/include/linux/skbuff.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/skbuff.h
-+++ linux-2.4.35.4/include/linux/skbuff.h
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
@@ -912,6 +912,49 @@ static inline void skb_reserve(struct sk
skb->tail+=len;
}
extern int ___pskb_trim(struct sk_buff *skb, unsigned int len, int realloc);
static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
-Index: linux-2.4.35.4/drivers/net/tun.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/tun.c
-+++ linux-2.4.35.4/drivers/net/tun.c
+--- a/drivers/net/tun.c
++++ b/drivers/net/tun.c
@@ -185,22 +185,31 @@ static __inline__ ssize_t tun_get_user(s
{
struct tun_pi pi = { 0, __constant_htons(ETH_P_IP) };
-Index: linux-2.4.35.4/fs/Config.in
-===================================================================
---- linux-2.4.35.4.orig/fs/Config.in
-+++ linux-2.4.35.4/fs/Config.in
+--- a/fs/Config.in
++++ b/fs/Config.in
@@ -77,6 +77,7 @@ dep_mbool ' JFS debugging' CONFIG_JFS_D
dep_mbool ' JFS statistics' CONFIG_JFS_STATISTICS $CONFIG_JFS_FS
tristate 'FreeVxFS file system support (VERITAS VxFS(TM) compatible)' CONFIG_VXFS_FS
tristate 'NTFS file system support (read only)' CONFIG_NTFS_FS
-Index: linux-2.4.35.4/fs/Makefile
-===================================================================
---- linux-2.4.35.4.orig/fs/Makefile
-+++ linux-2.4.35.4/fs/Makefile
+--- a/fs/Makefile
++++ b/fs/Makefile
@@ -31,6 +31,7 @@ subdir-$(CONFIG_RAMFS) += ramfs
subdir-$(CONFIG_CODA_FS) += coda
subdir-$(CONFIG_INTERMEZZO_FS) += intermezzo
subdir-$(CONFIG_FAT_FS) += fat
subdir-$(CONFIG_UMSDOS_FS) += umsdos
subdir-$(CONFIG_MSDOS_FS) += msdos
-Index: linux-2.4.35.4/fs/mini_fo/aux.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/aux.c
++++ b/fs/mini_fo/aux.c
@@ -0,0 +1,580 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
+
+#endif /* unused */
+
-Index: linux-2.4.35.4/fs/mini_fo/ChangeLog
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/ChangeLog
++++ b/fs/mini_fo/ChangeLog
@@ -0,0 +1,281 @@
+2006-01-24 Markus Klotzbuecher <mk@mary.denx.de>
+
+ * Implementation of mini_fo_mknod and mini_fo_rename, support
+ for device files.
+
-Index: linux-2.4.35.4/fs/mini_fo/dentry.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/dentry.c
++++ b/fs/mini_fo/dentry.c
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
+ d_delete: mini_fo_d_delete,
+ d_iput: mini_fo_d_iput,
+};
-Index: linux-2.4.35.4/fs/mini_fo/file.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/file.c
++++ b/fs/mini_fo/file.c
@@ -0,0 +1,717 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
+ /* not implemented: sendpage */
+ /* not implemented: get_unmapped_area */
+ };
-Index: linux-2.4.35.4/fs/mini_fo/fist.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/fist.h
++++ b/fs/mini_fo/fist.h
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
+# define FIST_IOCTL_SET_DEBUG_VALUE _IOW(0x15, 2, int)
+
+#endif /* not __FIST_H_ */
-Index: linux-2.4.35.4/fs/mini_fo/inode.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/inode.c
++++ b/fs/mini_fo/inode.c
@@ -0,0 +1,1573 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
+ removexattr: mini_fo_removexattr
+# endif /* XATTR && LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) */
+ };
-Index: linux-2.4.35.4/fs/mini_fo/main.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/main.c
++++ b/fs/mini_fo/main.c
@@ -0,0 +1,414 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
+
+module_init(init_mini_fo_fs)
+module_exit(exit_mini_fo_fs)
-Index: linux-2.4.35.4/fs/mini_fo/Makefile
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/Makefile
++++ b/fs/mini_fo/Makefile
@@ -0,0 +1,22 @@
+#
+# Makefile for mini_fo 2.4 and 2.6 Linux kernels
+# dependencies
+${mini_fo-objs}: mini_fo.h fist.h
+
-Index: linux-2.4.35.4/fs/mini_fo/meta.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/meta.c
++++ b/fs/mini_fo/meta.c
@@ -0,0 +1,1000 @@
+/*
+ * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de>
+ return 0;
+}
+
-Index: linux-2.4.35.4/fs/mini_fo/mini_fo.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/mini_fo.h
++++ b/fs/mini_fo/mini_fo.h
@@ -0,0 +1,503 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
+/* ioctls */
+
+#endif /* not __MINI_FO_H_ */
-Index: linux-2.4.35.4/fs/mini_fo/mini_fo-merge
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/mini_fo-merge
++++ b/fs/mini_fo/mini_fo-merge
@@ -0,0 +1,180 @@
+#!/bin/bash
+#
+#rm $TMP/$SKIP_DEL_LIST
+
+echo "Done!"
-Index: linux-2.4.35.4/fs/mini_fo/mini_fo-overlay
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/mini_fo-overlay
++++ b/fs/mini_fo/mini_fo-overlay
@@ -0,0 +1,130 @@
+#!/bin/bash
+#
+if [ $? -ne 0 ]; then
+ echo "Error, mounting failed, maybe no permisson to mount?"
+fi
-Index: linux-2.4.35.4/fs/mini_fo/mmap.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/mmap.c
++++ b/fs/mini_fo/mmap.c
@@ -0,0 +1,637 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
+ print_exit_status(err);
+ return err;
+}
-Index: linux-2.4.35.4/fs/mini_fo/README
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/README
++++ b/fs/mini_fo/README
@@ -0,0 +1,163 @@
+README for the mini_fo overlay file system
+=========================================
+2 of the License, or (at your option) any later version.
+
+
-Index: linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES
++++ b/fs/mini_fo/RELEASE_NOTES
@@ -0,0 +1,111 @@
+Release: mini_fo-0.6.1 (v0-6-1)
+Date: 21.09.2005
+original state. I hope to fix this someday. Please note that this does
+not effect the special hard links '.' and '..', that are handled
+seperately by the lower fs.
-Index: linux-2.4.35.4/fs/mini_fo/state.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/state.c
++++ b/fs/mini_fo/state.c
@@ -0,0 +1,620 @@
+/*
+ * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de>
+ return err;
+}
+
-Index: linux-2.4.35.4/fs/mini_fo/super.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/fs/mini_fo/super.c
++++ b/fs/mini_fo/super.c
@@ -0,0 +1,259 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h
++++ b/include/linux/netfilter_ipv4/ipt_ipp2p.h
@@ -0,0 +1,31 @@
+#ifndef __IPT_IPP2P_H
+#define __IPT_IPP2P_H
+#define IPP2P_MUTE (1 << 14)
+#define IPP2P_WASTE (1 << 15)
+#define IPP2P_XDCC (1 << 16)
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
@@ -26,6 +26,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
dep_tristate ' TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES
dep_tristate ' recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES
dep_tristate ' DSCP match support' CONFIG_IP_NF_MATCH_DSCP $CONFIG_IP_NF_IPTABLES
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
@@ -67,6 +67,7 @@ obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_
obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o
obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o
obj-$(CONFIG_IP_NF_MATCH_PKTTYPE) += ipt_pkttype.o
obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_ipp2p.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_ipp2p.c
++++ b/net/ipv4/netfilter/ipt_ipp2p.c
@@ -0,0 +1,868 @@
+#if defined(MODVERSIONS)
+#include <linux/modversions.h>
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
-@@ -29207,6 +29207,18 @@
+@@ -29207,6 +29207,18 @@ CONFIG_SOUND_WM97XX
If unsure, say N.
# capitalize: AppleTalk, Ethernet, DOS, DMA, FAT, FTP, Internet,
--- a/include/linux/netfilter_ipv4/ip_conntrack.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack.h
-@@ -207,6 +207,17 @@
+@@ -207,6 +207,17 @@ struct ip_conntrack
} nat;
#endif /* CONFIG_IP_NF_NAT_NEEDED */
+#endif /* _IPT_LAYER7_H */
--- a/net/ipv4/netfilter/Config.in
+++ b/net/ipv4/netfilter/Config.in
-@@ -44,6 +44,9 @@
+@@ -44,6 +44,9 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
dep_tristate ' Unclean match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_UNCLEAN $CONFIG_IP_NF_IPTABLES
dep_tristate ' Owner match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_OWNER $CONFIG_IP_NF_IPTABLES
dep_tristate ' Packet filtering' CONFIG_IP_NF_FILTER $CONFIG_IP_NF_IPTABLES
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
-@@ -87,6 +87,7 @@
+@@ -87,6 +87,7 @@ obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_s
obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o
obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o
obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o
obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
--- a/net/ipv4/netfilter/ip_conntrack_core.c
+++ b/net/ipv4/netfilter/ip_conntrack_core.c
-@@ -346,6 +346,14 @@
+@@ -346,6 +346,14 @@ destroy_conntrack(struct nf_conntrack *n
}
kfree(ct->master);
}
if (master)
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
-@@ -107,6 +107,13 @@
+@@ -107,6 +107,13 @@ print_conntrack(char *buffer, struct ip_
len += sprintf(buffer + len, "[ASSURED] ");
len += sprintf(buffer + len, "use=%u ",
atomic_read(&conntrack->ct_general.use));
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+--- a/include/linux/netfilter_ipv4/ip_conntrack.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -50,16 +50,19 @@ enum ip_conntrack_status {
#include <linux/netfilter_ipv4/ip_conntrack_tcp.h>
};
#endif
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
@@ -0,0 +1,313 @@
+/* PPTP constants and structs */
+#ifndef _CONNTRACK_PPTP_H
+
+#endif /* __KERNEL__ */
+#endif /* _CONNTRACK_PPTP_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
@@ -0,0 +1,123 @@
+#ifndef _CONNTRACK_PROTO_GRE_H
+#define _CONNTRACK_PROTO_GRE_H
+#endif /* __KERNEL__ */
+
+#endif /* _CONNTRACK_PROTO_GRE_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
+--- a/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
@@ -14,7 +14,7 @@
union ip_conntrack_manip_proto
{
#define CTINFO2DIR(ctinfo) ((ctinfo) >= IP_CT_IS_REPLY ? IP_CT_DIR_REPLY : IP_CT_DIR_ORIGINAL)
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat_pptp.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat_pptp.h
++++ b/include/linux/netfilter_ipv4/ip_nat_pptp.h
@@ -0,0 +1,11 @@
+/* PPTP constants and structs */
+#ifndef _NAT_PPTP_H
+};
+
+#endif /* _NAT_PPTP_H */
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
@@ -10,6 +10,8 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ];
dep_tristate ' Amanda protocol support' CONFIG_IP_NF_AMANDA $CONFIG_IP_NF_CONNTRACK
dep_tristate ' TFTP protocol support' CONFIG_IP_NF_TFTP $CONFIG_IP_NF_CONNTRACK
if [ "$CONFIG_IP_NF_AMANDA" = "m" ]; then
define_tristate CONFIG_IP_NF_NAT_AMANDA m
else
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
+--- a/net/ipv4/netfilter/ip_conntrack_core.c
++++ b/net/ipv4/netfilter/ip_conntrack_core.c
@@ -143,6 +143,8 @@ ip_ct_get_tuple(const struct iphdr *iph,
tuple->dst.ip = iph->daddr;
tuple->dst.protonum = iph->protocol;
&& LIST_FIND(&ip_conntrack_expect_list, expect_clash,
struct ip_conntrack_expect *, newtuple, &expect->mask)) {
/* Force NAT to find an unused tuple */
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h
++++ b/net/ipv4/netfilter/ip_conntrack_pptp_priv.h
@@ -0,0 +1,24 @@
+#ifndef _IP_CT_PPTP_PRIV_H
+#define _IP_CT_PPTP_PRIV_H
+};
+
+#endif
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c
++++ b/net/ipv4/netfilter/ip_conntrack_proto_gre.c
@@ -0,0 +1,333 @@
+/*
+ * ip_conntrack_proto_gre.c - Version 1.2
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_nat_core.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c
+--- a/net/ipv4/netfilter/ip_nat_core.c
++++ b/net/ipv4/netfilter/ip_nat_core.c
@@ -424,7 +424,7 @@ get_unique_tuple(struct ip_conntrack_tup
*tuple = *orig_tuple;
while ((rptr = find_best_ips_proto_fast(tuple, mr, conntrack, hooknum))
#endif
/* We now have two tuples (SRCIP/SRCPT/DSTIP/DSTPT):
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c
++++ b/net/ipv4/netfilter/ip_nat_pptp.c
@@ -0,0 +1,482 @@
+/*
+ * ip_nat_pptp.c - Version 1.5
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c
++++ b/net/ipv4/netfilter/ip_nat_proto_gre.c
@@ -0,0 +1,202 @@
+/*
+ * ip_nat_proto_gre.c - Version 1.2
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
@@ -36,23 +36,32 @@ obj-$(CONFIG_IP_NF_AMANDA) += ip_conntra
ifdef CONFIG_IP_NF_AMANDA
export-objs += ip_conntrack_amanda.o
# generic IP tables
obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp.c
++++ b/net/ipv4/netfilter/ip_conntrack_pptp.c
@@ -0,0 +1,635 @@
+/*
+ * ip_conntrack_pptp.c - Version 1.9
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
+--- a/net/ipv4/netfilter/ip_conntrack_core.c
++++ b/net/ipv4/netfilter/ip_conntrack_core.c
@@ -1410,7 +1410,7 @@ void ip_conntrack_cleanup(void)
nf_unregister_sockopt(&so_getorigdst);
}
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
@@ -3209,6 +3209,15 @@ CONFIG_IP_NF_TARGET_LOG
If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'.
ipchains (2.2-style) support
CONFIG_IP_NF_COMPAT_IPCHAINS
This option places ipchains (with masquerading and redirection
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_TTL.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_TTL.h
++++ b/include/linux/netfilter_ipv4/ipt_TTL.h
@@ -0,0 +1,21 @@
+/* TTL modification module for IP tables
+ * (C) 2000 by Harald Welte <laforge@gnumonks.org> */
+
+
+#endif
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
@@ -125,6 +125,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
dep_tristate ' MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE
fi
dep_tristate ' ULOG target support' CONFIG_IP_NF_TARGET_ULOG $CONFIG_IP_NF_IPTABLES
dep_tristate ' TCPMSS target support' CONFIG_IP_NF_TARGET_TCPMSS $CONFIG_IP_NF_IPTABLES
fi
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c
++++ b/net/ipv4/netfilter/ipt_TTL.c
@@ -0,0 +1,110 @@
+/* TTL modification target for IP tables
+ * (C) 2000 by Harald Welte <laforge@gnumonks.org>
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
@@ -109,6 +109,7 @@ obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) +=
obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
@@ -3086,6 +3086,17 @@ CONFIG_IP_NF_TARGET_REDIRECT
If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'.
Packet mangling
CONFIG_IP_NF_MANGLE
This option adds a `mangle' table to iptables: see the man page for
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
@@ -65,6 +65,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
define_bool CONFIG_IP_NF_NAT_NEEDED y
dep_tristate ' MASQUERADE target support' CONFIG_IP_NF_TARGET_MASQUERADE $CONFIG_IP_NF_NAT
if [ "$CONFIG_IP_NF_PPTP" = "m" ]; then
define_tristate CONFIG_IP_NF_NAT_PPTP m
else
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c
++++ b/net/ipv4/netfilter/ipt_NETMAP.c
@@ -0,0 +1,112 @@
+/* NETMAP - static NAT mapping of IP network addresses (1:1).
+ The mapping can be applied to source (POSTROUTING),
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
@@ -107,6 +107,7 @@ obj-$(CONFIG_IP_NF_TARGET_DSCP) += ipt_D
obj-$(CONFIG_IP_NF_TARGET_MARK) += ipt_MARK.o
obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+--- a/include/linux/netfilter_ipv4/ip_conntrack.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -226,6 +226,9 @@ struct ip_conntrack
unsigned int app_data_len;
} layer7;
};
/* get master conntrack via master expectation */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h
++++ b/include/linux/netfilter_ipv4/ipt_CONNMARK.h
@@ -0,0 +1,25 @@
+#ifndef _IPT_CONNMARK_H_target
+#define _IPT_CONNMARK_H_target
+};
+
+#endif /*_IPT_CONNMARK_H_target*/
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connmark.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connmark.h
++++ b/include/linux/netfilter_ipv4/ipt_connmark.h
@@ -0,0 +1,18 @@
+#ifndef _IPT_CONNMARK_H
+#define _IPT_CONNMARK_H
+};
+
+#endif /*_IPT_CONNMARK_H*/
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
@@ -6,7 +6,8 @@ comment ' IP: Netfilter Configuration'
tristate 'Connection tracking (required for masq/NAT)' CONFIG_IP_NF_CONNTRACK
dep_tristate ' LOG target support' CONFIG_IP_NF_TARGET_LOG $CONFIG_IP_NF_IPTABLES
dep_tristate ' TTL target support' CONFIG_IP_NF_TARGET_TTL $CONFIG_IP_NF_IPTABLES
dep_tristate ' ULOG target support' CONFIG_IP_NF_TARGET_ULOG $CONFIG_IP_NF_IPTABLES
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
@@ -93,6 +93,7 @@ obj-$(CONFIG_IP_NF_MATCH_LENGTH) += ipt_
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
obj-$(CONFIG_IP_NF_TARGET_TCPMSS) += ipt_TCPMSS.o
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
+--- a/net/ipv4/netfilter/ip_conntrack_core.c
++++ b/net/ipv4/netfilter/ip_conntrack_core.c
@@ -754,6 +754,9 @@ init_conntrack(const struct ip_conntrack
__set_bit(IPS_EXPECTED_BIT, &conntrack->status);
conntrack->master = expected;
LIST_DELETE(&ip_conntrack_expect_list, expected);
expected->expectant->expecting--;
nf_conntrack_get(&master_ct(conntrack)->infos[0]);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_standalone.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
+--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
++++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -107,6 +107,9 @@ print_conntrack(char *buffer, struct ip_
len += sprintf(buffer + len, "[ASSURED] ");
len += sprintf(buffer + len, "use=%u ",
#if defined(CONFIG_IP_NF_MATCH_LAYER7) || defined(CONFIG_IP_NF_MATCH_LAYER7_MODULE)
if(conntrack->layer7.app_proto)
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CONNMARK.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_CONNMARK.c
++++ b/net/ipv4/netfilter/ipt_CONNMARK.c
@@ -0,0 +1,118 @@
+/* This kernel module is used to modify the connection mark values, or
+ * to optionally restore the skb nfmark from the connection mark
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_connmark.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_connmark.c
++++ b/net/ipv4/netfilter/ipt_connmark.c
@@ -0,0 +1,83 @@
+/* This kernel module matches connection mark values set by the
+ * CONNMARK target
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
@@ -3220,6 +3220,75 @@ CONFIG_IP_NF_TARGET_LOG
If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'.
TTL target support
CONFIG_IP_NF_TARGET_TTL
This option adds a `TTL' target, which enables the user to set
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set.h
++++ b/include/linux/netfilter_ipv4/ip_set.h
@@ -0,0 +1,489 @@
+#ifndef _IP_SET_H
+#define _IP_SET_H
+#endif /* __KERNEL__ */
+
+#endif /*_IP_SET_H*/
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iphash.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iphash.h
++++ b/include/linux/netfilter_ipv4/ip_set_iphash.h
@@ -0,0 +1,30 @@
+#ifndef __IP_SET_IPHASH_H
+#define __IP_SET_IPHASH_H
+};
+
+#endif /* __IP_SET_IPHASH_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipmap.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipmap.h
++++ b/include/linux/netfilter_ipv4/ip_set_ipmap.h
@@ -0,0 +1,56 @@
+#ifndef __IP_SET_IPMAP_H
+#define __IP_SET_IPMAP_H
+}
+
+#endif /* __IP_SET_IPMAP_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iptree.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iptree.h
++++ b/include/linux/netfilter_ipv4/ip_set_iptree.h
@@ -0,0 +1,39 @@
+#ifndef __IP_SET_IPTREE_H
+#define __IP_SET_IPTREE_H
+};
+
+#endif /* __IP_SET_IPTREE_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_jhash.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_jhash.h
++++ b/include/linux/netfilter_ipv4/ip_set_jhash.h
@@ -0,0 +1,148 @@
+#ifndef _LINUX_IPSET_JHASH_H
+#define _LINUX_IPSET_JHASH_H
+}
+
+#endif /* _LINUX_IPSET_JHASH_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_macipmap.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_macipmap.h
++++ b/include/linux/netfilter_ipv4/ip_set_macipmap.h
@@ -0,0 +1,38 @@
+#ifndef __IP_SET_MACIPMAP_H
+#define __IP_SET_MACIPMAP_H
+};
+
+#endif /* __IP_SET_MACIPMAP_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_malloc.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_malloc.h
++++ b/include/linux/netfilter_ipv4/ip_set_malloc.h
@@ -0,0 +1,27 @@
+#ifndef _IP_SET_MALLOC_H
+#define _IP_SET_MALLOC_H
+#endif /* __KERNEL__ */
+
+#endif /*_IP_SET_MALLOC_H*/
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_nethash.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_nethash.h
++++ b/include/linux/netfilter_ipv4/ip_set_nethash.h
@@ -0,0 +1,55 @@
+#ifndef __IP_SET_NETHASH_H
+#define __IP_SET_NETHASH_H
+}
+
+#endif /* __IP_SET_NETHASH_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_portmap.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_portmap.h
++++ b/include/linux/netfilter_ipv4/ip_set_portmap.h
@@ -0,0 +1,25 @@
+#ifndef __IP_SET_PORTMAP_H
+#define __IP_SET_PORTMAP_H
+};
+
+#endif /* __IP_SET_PORTMAP_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_prime.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_prime.h
++++ b/include/linux/netfilter_ipv4/ip_set_prime.h
@@ -0,0 +1,34 @@
+#ifndef __IP_SET_PRIME_H
+#define __IP_SET_PRIME_H
+}
+
+#endif /* __IP_SET_PRIME_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_set.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_set.h
++++ b/include/linux/netfilter_ipv4/ipt_set.h
@@ -0,0 +1,21 @@
+#ifndef _IPT_SET_H
+#define _IPT_SET_H
+};
+
+#endif /*_IPT_SET_H*/
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
@@ -22,6 +22,20 @@ tristate 'IP tables support (required fo
if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then
# The simple matches.
dep_tristate ' MAC address match support' CONFIG_IP_NF_MATCH_MAC $CONFIG_IP_NF_IPTABLES
dep_tristate ' Packet type match support' CONFIG_IP_NF_MATCH_PKTTYPE $CONFIG_IP_NF_IPTABLES
dep_tristate ' netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set.c
++++ b/net/ipv4/netfilter/ip_set.c
@@ -0,0 +1,2002 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de>
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c
++++ b/net/ipv4/netfilter/ip_set_iphash.c
@@ -0,0 +1,379 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_ipmap.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_ipmap.c
++++ b/net/ipv4/netfilter/ip_set_ipmap.c
@@ -0,0 +1,314 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de>
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c
++++ b/net/ipv4/netfilter/ip_set_iptree.c
@@ -0,0 +1,511 @@
+/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_macipmap.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_macipmap.c
++++ b/net/ipv4/netfilter/ip_set_macipmap.c
@@ -0,0 +1,340 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de>
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c
++++ b/net/ipv4/netfilter/ip_set_nethash.c
@@ -0,0 +1,450 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c
++++ b/net/ipv4/netfilter/ip_set_portmap.c
@@ -0,0 +1,321 @@
+/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ *
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c
++++ b/net/ipv4/netfilter/ipt_set.c
@@ -0,0 +1,114 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de>
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c
++++ b/net/ipv4/netfilter/ipt_SET.c
@@ -0,0 +1,127 @@
+/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
+ * Patrick Schaaf <bof@bof.de>
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
@@ -75,6 +75,18 @@ obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o
obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o
obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_string.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_string.h
++++ b/include/linux/netfilter_ipv4/ipt_string.h
@@ -0,0 +1,18 @@
+#ifndef _IPT_STRING_H
+#define _IPT_STRING_H
+};
+
+#endif /*_IPT_STRING_H*/
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
@@ -63,6 +63,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
fi
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
dep_tristate ' Owner match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_OWNER $CONFIG_IP_NF_IPTABLES
dep_tristate ' Layer 7 match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_LAYER7 $CONFIG_IP_NF_CONNTRACK
dep_mbool ' Layer 7 debugging output (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_LAYER7_DEBUG $CONFIG_IP_NF_MATCH_LAYER7
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_string.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_string.c
++++ b/net/ipv4/netfilter/ipt_string.c
@@ -0,0 +1,99 @@
+/* String matching match for iptables
+ *
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
@@ -108,6 +108,7 @@ obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_s
obj-$(CONFIG_IP_NF_MATCH_CONNMARK) += ipt_connmark.o
obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o
obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o
obj-$(CONFIG_IP_NF_MATCH_LAYER7) += ipt_layer7.o
-Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c
++++ b/net/ipv4/netfilter/textsearch/textsearch.c
@@ -0,0 +1,305 @@
+/*
+ * lib/textsearch.c Generic text search interface
+ kfree(conf);
+}
+
-Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h
++++ b/net/ipv4/netfilter/textsearch/textsearch.h
@@ -0,0 +1,182 @@
+#ifndef __LINUX_TEXTSEARCH_H
+#define __LINUX_TEXTSEARCH_H
+#endif /* __KERNEL__ */
+
+#endif
-Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c
++++ b/net/ipv4/netfilter/textsearch/ts_bm.c
@@ -0,0 +1,190 @@
+/*
+ * lib/ts_bm.c Boyer-Moore text search implementation
+{
+ textsearch_unregister(&bm_ops);
+}
-Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_kmp.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_kmp.c
++++ b/net/ipv4/netfilter/textsearch/ts_kmp.c
@@ -0,0 +1,141 @@
+/*
+ * lib/ts_kmp.c Knuth-Morris-Pratt text search implementation
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
@@ -11,6 +11,8 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ];
dep_tristate ' Amanda protocol support' CONFIG_IP_NF_AMANDA $CONFIG_IP_NF_CONNTRACK
dep_tristate ' TFTP protocol support' CONFIG_IP_NF_TFTP $CONFIG_IP_NF_CONNTRACK
dep_tristate ' GRE protocol support' CONFIG_IP_NF_CT_PROTO_GRE $CONFIG_IP_NF_CONNTRACK
dep_tristate ' PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE
fi
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
@@ -106,6 +106,7 @@ obj-$(CONFIG_IP_NF_MATCH_LENGTH) += ipt_
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_state.o
obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o
obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o
obj-$(CONFIG_IP_NF_MATCH_STRING) += ipt_string.o
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_amanda.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_amanda.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_amanda.c
+--- a/net/ipv4/netfilter/ip_conntrack_amanda.c
++++ b/net/ipv4/netfilter/ip_conntrack_amanda.c
@@ -75,7 +75,7 @@ static int help(const struct iphdr *iph,
/* increase the UDP timeout of the master connection as replies from
/* Search for "CONNECT " string */
do {
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+--- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
++++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
@@ -211,7 +211,7 @@ static int tcp_packet(struct ip_conntrac
set_bit(IPS_ASSURED_BIT, &conntrack->status);
}
return NF_ACCEPT;
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_udp.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_udp.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_udp.c
+--- a/net/ipv4/netfilter/ip_conntrack_proto_udp.c
++++ b/net/ipv4/netfilter/ip_conntrack_proto_udp.c
@@ -47,16 +47,16 @@ static unsigned int udp_print_conntrack(
/* Returns verdict for packet, and may modify conntracktype */
static int udp_packet(struct ip_conntrack *conntrack,
return NF_ACCEPT;
}
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_standalone.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
+--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
++++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -79,6 +79,18 @@ print_expect(char *buffer, const struct
return len;
}
EXPORT_SYMBOL(ip_ct_find_proto);
EXPORT_SYMBOL(__ip_ct_find_proto);
EXPORT_SYMBOL(ip_ct_find_helper);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_generic.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_generic.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_generic.c
+--- a/net/ipv4/netfilter/ip_conntrack_proto_generic.c
++++ b/net/ipv4/netfilter/ip_conntrack_proto_generic.c
@@ -41,9 +41,9 @@ static unsigned int generic_print_conntr
/* Returns verdict for packet, or -1 for invalid. */
static int established(struct ip_conntrack *conntrack,
return NF_ACCEPT;
}
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
+--- a/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
++++ b/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
@@ -82,7 +82,7 @@ static int icmp_packet(struct ip_conntra
ct->timeout.function((unsigned long)ct);
} else {
}
return NF_ACCEPT;
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
+--- a/net/ipv4/netfilter/ip_conntrack_core.c
++++ b/net/ipv4/netfilter/ip_conntrack_core.c
@@ -1196,22 +1196,40 @@ void ip_conntrack_helper_unregister(stru
MOD_DEC_USE_COUNT;
}
WRITE_UNLOCK(&ip_conntrack_lock);
}
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+--- a/include/linux/netfilter_ipv4/ip_conntrack.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -164,6 +164,12 @@ struct ip_conntrack_expect
union ip_conntrack_expect_help help;
};
/* These are for NAT. Icky. */
/* Call me when a conntrack is destroyed. */
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_connbytes.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_connbytes.c
++++ b/net/ipv4/netfilter/ipt_connbytes.c
@@ -0,0 +1,163 @@
+/* Kernel module to match connection tracking byte counter.
+ * GPL (C) 2002 Martin Devera (devik@cdi.cz).
+module_init(init);
+module_exit(fini);
+MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connbytes.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connbytes.h
++++ b/include/linux/netfilter_ipv4/ipt_connbytes.h
@@ -0,0 +1,25 @@
+#ifndef _IPT_CONNBYTES_H
+#define _IPT_CONNBYTES_H
+};
+
+#endif
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_proto_gre.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c
+--- a/net/ipv4/netfilter/ip_conntrack_proto_gre.c
++++ b/net/ipv4/netfilter/ip_conntrack_proto_gre.c
@@ -237,16 +237,16 @@ static unsigned int gre_print_conntrack(
/* Returns verdict for packet, and may modify conntrack */
static int gre_packet(struct ip_conntrack *ct,
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
@@ -2979,6 +2979,14 @@ CONFIG_IP_NF_MATCH_TOS
If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'.
Multiple port match support
CONFIG_IP6_NF_MATCH_MULTIPORT
Multiport matching allows you to match TCP or UDP packets based on
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_condition.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_condition.h
++++ b/include/linux/netfilter_ipv4/ipt_condition.h
@@ -0,0 +1,11 @@
+#ifndef __IPT_CONDITION_MATCH__
+#define __IPT_CONDITION_MATCH__
+};
+
+#endif
-Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h
++++ b/include/linux/netfilter_ipv6/ip6t_condition.h
@@ -0,0 +1,11 @@
+#ifndef __IP6T_CONDITION_MATCH__
+#define __IP6T_CONDITION_MATCH__
+};
+
+#endif
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
@@ -43,6 +43,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
dep_tristate ' netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES
dep_tristate ' Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES
dep_tristate ' recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES
dep_tristate ' ECN match support' CONFIG_IP_NF_MATCH_ECN $CONFIG_IP_NF_IPTABLES
dep_tristate ' peer to peer traffic match support' CONFIG_IP_NF_MATCH_IPP2P $CONFIG_IP_NF_IPTABLES
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
@@ -94,6 +94,7 @@ obj-$(CONFIG_IP_NF_MATCH_PKTTYPE) += ipt
obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o
obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_owner.o
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c
++++ b/net/ipv4/netfilter/ipt_condition.c
@@ -0,0 +1,256 @@
+/*-------------------------------------------*\
+| Netfilter Condition Module |
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in
+--- a/net/ipv6/netfilter/Config.in
++++ b/net/ipv6/netfilter/Config.in
@@ -17,6 +17,7 @@ tristate 'IP6 tables support (required f
if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ]; then
# The simple matches.
dep_tristate ' MAC address match support' CONFIG_IP6_NF_MATCH_MAC $CONFIG_IP6_NF_IPTABLES
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
dep_tristate ' Routing header match support (EXPERIMENTAL)' CONFIG_IP6_NF_MATCH_RT $CONFIG_IP6_NF_IPTABLES
-Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile
+--- a/net/ipv6/netfilter/Makefile
++++ b/net/ipv6/netfilter/Makefile
@@ -14,6 +14,7 @@ export-objs := ip6_tables.o
# Link order matters here.
obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
obj-$(CONFIG_IP6_NF_MATCH_MARK) += ip6t_mark.o
obj-$(CONFIG_IP6_NF_MATCH_LENGTH) += ip6t_length.o
obj-$(CONFIG_IP6_NF_MATCH_MAC) += ip6t_mac.o
-Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_condition.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_condition.c
++++ b/net/ipv6/netfilter/ip6t_condition.c
@@ -0,0 +1,254 @@
+/*-------------------------------------------*\
+| Netfilter Condition Module for IPv6 |
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
@@ -2888,6 +2888,13 @@ CONFIG_IP_NF_MATCH_LIMIT
If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'.
skb->pkt_type packet match support
CONFIG_IP_NF_MATCH_PKTTYPE
This patch allows you to match packet in accrodance
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_quota.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_quota.h
++++ b/include/linux/netfilter_ipv4/ipt_quota.h
@@ -0,0 +1,12 @@
+#ifndef _IPT_QUOTA_H
+#define _IPT_QUOTA_H
+};
+
+#endif /*_IPT_QUOTA_H*/
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
@@ -24,6 +24,7 @@ tristate 'IP tables support (required fo
if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then
# The simple matches.
dep_tristate ' IP set support' CONFIG_IP_NF_SET $CONFIG_IP_NF_IPTABLES
if [ "$CONFIG_IP_NF_SET" != "n" ]; then
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
@@ -74,6 +74,7 @@ obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o
# matches
obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o
obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o
obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o
obj-$(CONFIG_IP_NF_TARGET_SET) += ipt_SET.o
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_quota.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_quota.c
++++ b/net/ipv4/netfilter/ipt_quota.c
@@ -0,0 +1,88 @@
+/*
+ * netfilter module to enforce network quotas
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
@@ -15,6 +15,7 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ];
dep_tristate ' Connection byte counter support' CONFIG_IP_NF_MATCH_CONNBYTES $CONFIG_IP_NF_CT_ACCT $CONFIG_IP_NF_CONNTRACK $CONFIG_IP_NF_IPTABLES
dep_tristate ' GRE protocol support' CONFIG_IP_NF_CT_PROTO_GRE $CONFIG_IP_NF_CONNTRACK
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
dep_tristate ' Basic SNMP-ALG support (EXPERIMENTAL)' CONFIG_IP_NF_NAT_SNMP_BASIC $CONFIG_IP_NF_NAT
fi
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
@@ -53,6 +53,10 @@ obj-$(CONFIG_IP_NF_PPTP) += ip_conntrack
ifdef CONFIG_IP_NF_NAT_PPTP
export-objs += ip_conntrack_pptp.o
# generic IP tables
obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c
++++ b/net/ipv4/netfilter/ip_conntrack_h323.c
@@ -0,0 +1,302 @@
+/*
+ * H.323 'brute force' extension for H.323 connection tracking.
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c
++++ b/net/ipv4/netfilter/ip_nat_h323.c
@@ -0,0 +1,403 @@
+/*
+ * H.323 'brute force' extension for NAT alteration.
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+--- a/include/linux/netfilter_ipv4/ip_conntrack.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -71,6 +71,7 @@ union ip_conntrack_expect_proto {
#include <linux/netfilter_ipv4/ip_conntrack_ftp.h>
#include <linux/netfilter_ipv4/ip_conntrack_irc.h>
};
#ifdef CONFIG_IP_NF_NAT_NEEDED
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_h323.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_h323.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack_h323.h
@@ -0,0 +1,30 @@
+#ifndef _IP_CONNTRACK_H323_H
+#define _IP_CONNTRACK_H323_H
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
@@ -16,6 +16,7 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ];
dep_tristate ' GRE protocol support' CONFIG_IP_NF_CT_PROTO_GRE $CONFIG_IP_NF_CONNTRACK
dep_tristate ' PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
dep_tristate ' Basic SNMP-ALG support (EXPERIMENTAL)' CONFIG_IP_NF_NAT_SNMP_BASIC $CONFIG_IP_NF_NAT
fi
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
@@ -57,6 +57,11 @@ obj-$(CONFIG_IP_NF_H323) += ip_conntrack
ifdef CONFIG_IP_NF_NAT_H323
export-objs += ip_conntrack_h323.o
# generic IP tables
obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c
++++ b/net/ipv4/netfilter/ip_conntrack_rtsp.c
@@ -0,0 +1,507 @@
+/*
+ * RTSP extension for IP connection tracking
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c
++++ b/net/ipv4/netfilter/ip_nat_rtsp.c
@@ -0,0 +1,621 @@
+/*
+ * RTSP extension for TCP NAT alteration
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
-===================================================================
---- linux-2.4.35.4.orig/arch/mips/kernel/mips_ksyms.c
-+++ linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c
+--- a/arch/mips/kernel/mips_ksyms.c
++++ b/arch/mips/kernel/mips_ksyms.c
@@ -52,6 +52,7 @@ EXPORT_SYMBOL(EISA_bus);
/*
* String functions
EXPORT_SYMBOL_NOVERS(memcmp);
EXPORT_SYMBOL_NOVERS(memset);
EXPORT_SYMBOL_NOVERS(memcpy);
-Index: linux-2.4.35.4/include/linux/netfilter_helpers.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_helpers.h
++++ b/include/linux/netfilter_helpers.h
@@ -0,0 +1,133 @@
+/*
+ * Helpers for netfiler modules. This file provides implementations for basic
+#endif /* __KERNEL__ */
+
+#endif /* _NETFILTER_HELPERS_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
@@ -0,0 +1,68 @@
+/*
+ * RTSP extension for IP connection tracking.
+#endif /* __KERNEL__ */
+
+#endif /* _IP_CONNTRACK_RTSP_H */
-Index: linux-2.4.35.4/include/linux/netfilter_mime.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_mime.h
++++ b/include/linux/netfilter_mime.h
@@ -0,0 +1,90 @@
+/*
+ * MIME functions for netfilter modules. This file provides implementations
+#endif /* __KERNEL__ */
+
+#endif /* _NETFILTER_MIME_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+--- a/include/linux/netfilter_ipv4/ip_conntrack.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -72,6 +72,7 @@ union ip_conntrack_expect_proto {
#include <linux/netfilter_ipv4/ip_conntrack_irc.h>
#include <linux/netfilter_ipv4/ip_conntrack_pptp.h>
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
@@ -17,6 +17,7 @@ if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ];
dep_tristate ' PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE
dep_tristate ' H.323 (netmeeting) support' CONFIG_IP_NF_H323 $CONFIG_IP_NF_CONNTRACK
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
dep_tristate ' Basic SNMP-ALG support (EXPERIMENTAL)' CONFIG_IP_NF_NAT_SNMP_BASIC $CONFIG_IP_NF_NAT
fi
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
@@ -61,6 +61,10 @@ obj-$(CONFIG_IP_NF_RTSP) += ip_conntrack
ifdef CONFIG_IP_NF_NAT_RTSP
export-objs += ip_conntrack_rtsp.o
# generic IP tables
obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_mms.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_mms.c
++++ b/net/ipv4/netfilter/ip_conntrack_mms.c
@@ -0,0 +1,292 @@
+/* MMS extension for IP connection tracking
+ * (C) 2002 by Filip Sneppe <filip.sneppe@cronos.be>
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_mms.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_mms.c
++++ b/net/ipv4/netfilter/ip_nat_mms.c
@@ -0,0 +1,330 @@
+/* MMS extension for TCP NAT alteration.
+ * (C) 2002 by Filip Sneppe <filip.sneppe@cronos.be>
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+--- a/include/linux/netfilter_ipv4/ip_conntrack.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -73,6 +73,7 @@ union ip_conntrack_expect_proto {
#include <linux/netfilter_ipv4/ip_conntrack_pptp.h>
#include <linux/netfilter_ipv4/ip_conntrack_h323.h>
};
#ifdef CONFIG_IP_NF_NAT_NEEDED
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_mms.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_mms.h
++++ b/include/linux/netfilter_ipv4/ip_conntrack_mms.h
@@ -0,0 +1,31 @@
+#ifndef _IP_CONNTRACK_MMS_H
+#define _IP_CONNTRACK_MMS_H
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
@@ -3160,6 +3160,22 @@ CONFIG_IP_NF_TARGET_TOS
If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'.
SLIP (serial line) support
CONFIG_SLIP
Say Y if you intend to use SLIP or CSLIP (compressed SLIP) to
-Index: linux-2.4.35.4/drivers/net/Config.in
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/Config.in
-+++ linux-2.4.35.4/drivers/net/Config.in
+--- a/drivers/net/Config.in
++++ b/drivers/net/Config.in
@@ -7,6 +7,11 @@ source drivers/net/arcnet/Config.in
tristate 'Dummy net driver support' CONFIG_DUMMY
tristate 'Bonding driver support' CONFIG_BONDING
tristate 'Universal TUN/TAP device driver support' CONFIG_TUN
bool 'Allow Net Devices to contribute to /dev/random' CONFIG_NET_RANDOM
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-Index: linux-2.4.35.4/drivers/net/Makefile
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/Makefile
-+++ linux-2.4.35.4/drivers/net/Makefile
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
@@ -176,6 +176,7 @@ endif
obj-$(CONFIG_STRIP) += strip.o
obj-$(CONFIG_DE600) += de600.o
obj-$(CONFIG_DE620) += de620.o
obj-$(CONFIG_AT1500) += lance.o
-Index: linux-2.4.35.4/drivers/net/imq.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/drivers/net/imq.c
++++ b/drivers/net/imq.c
@@ -0,0 +1,321 @@
+/*
+ * Pseudo-driver for the intermediate queue device.
+module_init(imq_init_module);
+module_exit(imq_cleanup_module);
+MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/include/linux/imq.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/imq.h
++++ b/include/linux/imq.h
@@ -0,0 +1,9 @@
+#ifndef _IMQ_H
+#define _IMQ_H
+#define IMQ_F_ENQUEUE 0x80
+
+#endif /* _IMQ_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h
++++ b/include/linux/netfilter_ipv4/ipt_IMQ.h
@@ -0,0 +1,8 @@
+#ifndef _IPT_IMQ_H
+#define _IPT_IMQ_H
+};
+
+#endif /* _IPT_IMQ_H */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_IMQ.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_IMQ.h
++++ b/include/linux/netfilter_ipv6/ip6t_IMQ.h
@@ -0,0 +1,8 @@
+#ifndef _IP6T_IMQ_H
+#define _IP6T_IMQ_H
+};
+
+#endif /* _IP6T_IMQ_H */
-Index: linux-2.4.35.4/include/linux/skbuff.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/skbuff.h
-+++ linux-2.4.35.4/include/linux/skbuff.h
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
@@ -93,6 +93,9 @@ struct nf_ct_info {
struct nf_conntrack *master;
};
};
#ifdef __KERNEL__
-Index: linux-2.4.35.4/net/core/skbuff.c
-===================================================================
---- linux-2.4.35.4.orig/net/core/skbuff.c
-+++ linux-2.4.35.4/net/core/skbuff.c
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
@@ -202,6 +202,10 @@ struct sk_buff *alloc_skb(unsigned int s
/* Set up other state */
skb->len = 0;
}
/**
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
@@ -171,6 +171,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
dep_tristate ' DSCP target support' CONFIG_IP_NF_TARGET_DSCP $CONFIG_IP_NF_MANGLE
fi
if [ "$CONFIG_IP_NF_CONNTRACK_MARK" != "n" ]; then
dep_tristate ' CONNMARK target support' CONFIG_IP_NF_TARGET_CONNMARK $CONFIG_IP_NF_IPTABLES
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
@@ -138,6 +138,7 @@ obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TO
obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
obj-$(CONFIG_IP_NF_TARGET_DSCP) += ipt_DSCP.o
obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_IMQ.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_IMQ.c
++++ b/net/ipv4/netfilter/ipt_IMQ.c
@@ -0,0 +1,78 @@
+/* This target marks packets to be enqueued to an imq device */
+#include <linux/module.h>
+module_init(init);
+module_exit(fini);
+MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in
+--- a/net/ipv6/netfilter/Config.in
++++ b/net/ipv6/netfilter/Config.in
@@ -72,6 +72,7 @@ if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ];
if [ "$CONFIG_IP6_NF_MANGLE" != "n" ]; then
# dep_tristate ' TOS target support' CONFIG_IP6_NF_TARGET_TOS $CONFIG_IP_NF_MANGLE
fi
#dep_tristate ' LOG target support' CONFIG_IP6_NF_TARGET_LOG $CONFIG_IP6_NF_IPTABLES
fi
-Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile
+--- a/net/ipv6/netfilter/Makefile
++++ b/net/ipv6/netfilter/Makefile
@@ -29,6 +29,7 @@ obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t
obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o
obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o
-Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_IMQ.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_IMQ.c
++++ b/net/ipv6/netfilter/ip6t_IMQ.c
@@ -0,0 +1,78 @@
+/* This target marks packets to be enqueued to an imq device */
+#include <linux/module.h>
+module_init(init);
+module_exit(fini);
+MODULE_LICENSE("GPL");
-Index: linux-2.4.35.4/net/sched/sch_generic.c
-===================================================================
---- linux-2.4.35.4.orig/net/sched/sch_generic.c
-+++ linux-2.4.35.4/net/sched/sch_generic.c
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
@@ -29,6 +29,9 @@
#include <linux/skbuff.h>
#include <linux/rtnetlink.h>
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_multiport.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ipt_multiport.h
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_multiport.h
+--- a/include/linux/netfilter_ipv4/ipt_multiport.h
++++ b/include/linux/netfilter_ipv4/ipt_multiport.h
@@ -11,11 +11,12 @@ enum ipt_multiport_flags
#define IPT_MULTI_PORTS 15
+ u_int8_t invert; /* Invert flag */
};
#endif /*_IPT_MULTIPORT_H*/
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_multiport.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ipt_multiport.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_multiport.c
+--- a/net/ipv4/netfilter/ipt_multiport.c
++++ b/net/ipv4/netfilter/ipt_multiport.c
@@ -1,5 +1,14 @@
/* Kernel module to match one of a list of TCP/UDP ports: ports are in
the same place so we can treat them as equal. */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
++++ b/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
@@ -0,0 +1,8 @@
+#ifndef _IPT_CLASSIFY_H
+#define _IPT_CLASSIFY_H
+};
+
+#endif /*_IPT_CLASSIFY_H */
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
-@@ -172,6 +172,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
+@@ -171,6 +171,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
dep_tristate ' DSCP target support' CONFIG_IP_NF_TARGET_DSCP $CONFIG_IP_NF_MANGLE
dep_tristate ' MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE
dep_tristate ' IMQ target support' CONFIG_IP_NF_TARGET_IMQ $CONFIG_IP_NF_MANGLE
fi
if [ "$CONFIG_IP_NF_CONNTRACK_MARK" != "n" ]; then
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c
++++ b/net/ipv4/netfilter/ipt_CLASSIFY.c
@@ -0,0 +1,82 @@
+/*
+ * This is a module which is used for setting the skb->priority field
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
-@@ -134,6 +134,7 @@ obj-$(CONFIG_IP_NF_MATCH_LAYER7) += ipt_
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
+@@ -133,6 +133,7 @@ obj-$(CONFIG_IP_NF_MATCH_LAYER7) += ipt_
# targets
obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
@@ -2986,6 +2986,14 @@ CONFIG_IP_NF_MATCH_TOS
If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'.
Condition variable match support
CONFIG_IP_NF_MATCH_CONDITION
This option allows you to match firewall rules against condition
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_iprange.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_iprange.h
++++ b/include/linux/netfilter_ipv4/ipt_iprange.h
@@ -0,0 +1,23 @@
+#ifndef _IPT_IPRANGE_H
+#define _IPT_IPRANGE_H
+};
+
+#endif /* _IPT_IPRANGE_H */
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
@@ -27,6 +27,7 @@ tristate 'IP tables support (required fo
if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; then
# The simple matches.
dep_tristate ' quota match support' CONFIG_IP_NF_MATCH_QUOTA $CONFIG_IP_NF_IPTABLES
dep_tristate ' IP set support' CONFIG_IP_NF_SET $CONFIG_IP_NF_IPTABLES
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_iprange.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_iprange.c
++++ b/net/ipv4/netfilter/ipt_iprange.c
@@ -0,0 +1,101 @@
+/*
+ * iptables module to match IP address ranges
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
@@ -90,6 +90,7 @@ obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o
# matches
obj-$(CONFIG_IP_NF_MATCH_HELPER) += ipt_helper.o
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
@@ -2914,6 +2914,15 @@ CONFIG_IP_NF_MATCH_MAC
If you want to compile it as a module, say M here and read
<file:Documentation/modules.txt>. If unsure, say `N'.
length match support
CONFIG_IP6_NF_MATCH_LENGTH
This option allows you to match the length of a packet against a
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h
++++ b/include/linux/netfilter_ipv4/ipt_random.h
@@ -0,0 +1,11 @@
+#ifndef _IPT_RAND_H
+#define _IPT_RAND_H
+};
+
+#endif /*_IPT_RAND_H*/
-Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h
++++ b/include/linux/netfilter_ipv6/ip6t_random.h
@@ -0,0 +1,11 @@
+#ifndef _IP6T_RAND_H
+#define _IP6T_RAND_H
+};
+
+#endif /*_IP6T_RAND_H*/
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
++++ b/net/ipv4/netfilter/Config.in
@@ -48,6 +48,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];
dep_tristate ' netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES
dep_tristate ' Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES
dep_tristate ' condition match support' CONFIG_IP_NF_MATCH_CONDITION $CONFIG_IP_NF_IPTABLES
dep_tristate ' recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES
dep_tristate ' ECN match support' CONFIG_IP_NF_MATCH_ECN $CONFIG_IP_NF_IPTABLES
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c
++++ b/net/ipv4/netfilter/ipt_random.c
@@ -0,0 +1,96 @@
+/*
+ This is a module which is used for a "random" match support.
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
-@@ -115,6 +115,8 @@ obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos
- obj-$(CONFIG_IP_NF_MATCH_TIME) += ipt_time.o
+--- a/net/ipv4/netfilter/Makefile
++++ b/net/ipv4/netfilter/Makefile
+@@ -114,6 +114,8 @@ obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_o
+ obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
obj-$(CONFIG_IP_NF_MATCH_CONDITION) += ipt_condition.o
+obj-$(CONFIG_IP_NF_MATCH_RANDOM) += ipt_random.o
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
-Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in
+--- a/net/ipv6/netfilter/Config.in
++++ b/net/ipv6/netfilter/Config.in
@@ -19,6 +19,7 @@ if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ];
dep_tristate ' limit match support' CONFIG_IP6_NF_MATCH_LIMIT $CONFIG_IP6_NF_IPTABLES
dep_tristate ' condition match support' CONFIG_IP6_NF_MATCH_CONDITION $CONFIG_IP6_NF_IPTABLES
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
dep_tristate ' Routing header match support (EXPERIMENTAL)' CONFIG_IP6_NF_MATCH_RT $CONFIG_IP6_NF_IPTABLES
fi
-Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c
++++ b/net/ipv6/netfilter/ip6t_random.c
@@ -0,0 +1,97 @@
+/*
+ This is a module which is used for a "random" match support.
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile
+--- a/net/ipv6/netfilter/Makefile
++++ b/net/ipv6/netfilter/Makefile
@@ -32,6 +32,7 @@ obj-$(CONFIG_IP6_NF_TARGET_MARK) += ip6t
obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o
obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
-Index: linux-2.4.35.4/Documentation/Configure.help
-===================================================================
---- linux-2.4.35.4.orig/Documentation/Configure.help
-+++ linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
++++ b/Documentation/Configure.help
@@ -11153,6 +11153,24 @@ CONFIG_NET_SCH_HFSC
whenever you want). If you want to compile it as a module, say M
here and read <file:Documentation/modules.txt>.
CSZ packet scheduler
CONFIG_NET_SCH_CSZ
Say Y here if you want to use the Clark-Shenker-Zhang (CSZ) packet
-Index: linux-2.4.35.4/include/linux/pkt_sched.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/pkt_sched.h
-+++ linux-2.4.35.4/include/linux/pkt_sched.h
+--- a/include/linux/pkt_sched.h
++++ b/include/linux/pkt_sched.h
@@ -173,8 +173,36 @@ struct tc_sfq_qopt
*
* The only reason for this is efficiency, it is possible
/* RED section */
enum
-Index: linux-2.4.35.4/net/sched/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/sched/Config.in
-+++ linux-2.4.35.4/net/sched/Config.in
+--- a/net/sched/Config.in
++++ b/net/sched/Config.in
@@ -12,6 +12,7 @@ fi
tristate ' The simplest PRIO pseudoscheduler' CONFIG_NET_SCH_PRIO
tristate ' RED queue' CONFIG_NET_SCH_RED
tristate ' TEQL queue' CONFIG_NET_SCH_TEQL
tristate ' TBF queue' CONFIG_NET_SCH_TBF
tristate ' GRED queue' CONFIG_NET_SCH_GRED
-Index: linux-2.4.35.4/net/sched/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/sched/Makefile
-+++ linux-2.4.35.4/net/sched/Makefile
+--- a/net/sched/Makefile
++++ b/net/sched/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_NET_SCH_HPFQ) += sch_hpfq.o
obj-$(CONFIG_NET_SCH_HFSC) += sch_hfsc.o
obj-$(CONFIG_NET_SCH_HTB) += sch_htb.o
obj-$(CONFIG_NET_SCH_RED) += sch_red.o
obj-$(CONFIG_NET_SCH_TBF) += sch_tbf.o
obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o
-Index: linux-2.4.35.4/net/sched/sch_esfq.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/sched/sch_esfq.c
++++ b/net/sched/sch_esfq.c
@@ -0,0 +1,649 @@
+/*
+ * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline.
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h
++++ b/include/linux/netfilter_ipv4/ip_set_ipporthash.h
@@ -0,0 +1,34 @@
+#ifndef __IP_SET_IPPORTHASH_H
+#define __IP_SET_IPPORTHASH_H
-Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_REJECT.c
-===================================================================
--- /dev/null
-+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_REJECT.c
++++ b/net/ipv6/netfilter/ip6t_REJECT.c
@@ -0,0 +1,301 @@
+/*
+ * This is a module which is used for rejecting packets.
+
+module_init(init);
+module_exit(fini);
-Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_REJECT.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/netfilter_ipv6/ip6t_REJECT.h
-+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_REJECT.h
+--- a/include/linux/netfilter_ipv6/ip6t_REJECT.h
++++ b/include/linux/netfilter_ipv6/ip6t_REJECT.h
@@ -2,15 +2,17 @@
#define _IP6T_REJECT_H
-#endif /*_IPT_REJECT_H*/
+#endif /*_IP6T_REJECT_H*/
-Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile
-===================================================================
---- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile
-+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile
+--- a/net/ipv6/netfilter/Makefile
++++ b/net/ipv6/netfilter/Makefile
@@ -34,5 +34,7 @@ obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.
obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
obj-$(CONFIG_IP6_NF_MATCH_RANDOM) += ip6t_random.o
+
include $(TOPDIR)/Rules.make
-Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in
-===================================================================
---- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in
-+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in
+--- a/net/ipv6/netfilter/Config.in
++++ b/net/ipv6/netfilter/Config.in
@@ -61,6 +61,9 @@ if [ "$CONFIG_IP6_NF_IPTABLES" != "n" ];
if [ "$CONFIG_IP6_NF_FILTER" != "n" ]; then
dep_tristate ' LOG target support' CONFIG_IP6_NF_TARGET_LOG $CONFIG_IP6_NF_FILTER
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_nat.h
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat.h
+--- a/include/linux/netfilter_ipv4/ip_nat.h
++++ b/include/linux/netfilter_ipv4/ip_nat.h
@@ -121,5 +121,13 @@ extern int ip_nat_used_tuple(const struc
extern u_int16_t ip_nat_cheat_check(u_int32_t oldvalinv,
u_int32_t newval,
+
#endif /*__KERNEL__*/
#endif
-Index: linux-2.4.35.4/include/linux/rtnetlink.h
-===================================================================
---- linux-2.4.35.4.orig/include/linux/rtnetlink.h
-+++ linux-2.4.35.4/include/linux/rtnetlink.h
+--- a/include/linux/rtnetlink.h
++++ b/include/linux/rtnetlink.h
@@ -234,6 +234,8 @@ struct rtnexthop
#define RTNH_F_DEAD 1 /* Nexthop is dead (used by multipath) */
#define RTNH_F_PERVASIVE 2 /* Do recursive gateway lookup */
/* Macros to handle hexthops */
-Index: linux-2.4.35.4/include/net/ip_fib.h
-===================================================================
---- linux-2.4.35.4.orig/include/net/ip_fib.h
-+++ linux-2.4.35.4/include/net/ip_fib.h
+--- a/include/net/ip_fib.h
++++ b/include/net/ip_fib.h
@@ -162,7 +162,8 @@ static inline int fib_lookup(const struc
static inline void fib_select_default(const struct rt_key *key, struct fib_result *res)
+extern rwlock_t fib_nhflags_lock;
#endif /* _NET_FIB_H */
-Index: linux-2.4.35.4/include/net/route.h
-===================================================================
---- linux-2.4.35.4.orig/include/net/route.h
-+++ linux-2.4.35.4/include/net/route.h
+--- a/include/net/route.h
++++ b/include/net/route.h
@@ -49,6 +49,8 @@ struct rt_key
{
__u32 dst;
static inline void ip_rt_put(struct rtable * rt)
{
if (rt)
-Index: linux-2.4.35.4/net/ipv4/fib_frontend.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/fib_frontend.c
-+++ linux-2.4.35.4/net/ipv4/fib_frontend.c
+--- a/net/ipv4/fib_frontend.c
++++ b/net/ipv4/fib_frontend.c
@@ -54,6 +54,8 @@
struct fib_table *local_table;
struct fib_table *main_table;
rt_cache_flush(-1);
break;
case NETDEV_DOWN:
-Index: linux-2.4.35.4/net/ipv4/fib_hash.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/fib_hash.c
-+++ linux-2.4.35.4/net/ipv4/fib_hash.c
+--- a/net/ipv4/fib_hash.c
++++ b/net/ipv4/fib_hash.c
@@ -71,6 +71,7 @@ struct fib_node
struct fib_info *fn_info;
#define FIB_INFO(f) ((f)->fn_info)
new_f->fn_key = key;
#ifdef CONFIG_IP_ROUTE_TOS
new_f->fn_tos = tos;
-Index: linux-2.4.35.4/net/ipv4/fib_rules.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/fib_rules.c
-+++ linux-2.4.35.4/net/ipv4/fib_rules.c
+--- a/net/ipv4/fib_rules.c
++++ b/net/ipv4/fib_rules.c
@@ -307,6 +307,11 @@ static void fib_rules_attach(struct net_
}
}
struct fib_table *tb;
if ((tb = fib_get_table(res->r->r_table)) != NULL)
tb->tb_select_default(tb, key, res);
-Index: linux-2.4.35.4/net/ipv4/fib_semantics.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/fib_semantics.c
-+++ linux-2.4.35.4/net/ipv4/fib_semantics.c
+--- a/net/ipv4/fib_semantics.c
++++ b/net/ipv4/fib_semantics.c
@@ -48,6 +48,7 @@
static struct fib_info *fib_info_list;
static rwlock_t fib_info_lock = RW_LOCK_UNLOCKED;
spin_unlock_bh(&fib_multipath_lock);
}
#endif
-Index: linux-2.4.35.4/net/ipv4/ip_nat_dumb.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/ip_nat_dumb.c
-+++ linux-2.4.35.4/net/ipv4/ip_nat_dumb.c
+--- a/net/ipv4/ip_nat_dumb.c
++++ b/net/ipv4/ip_nat_dumb.c
@@ -124,6 +124,7 @@ ip_do_nat(struct sk_buff *skb)
key.dst = ciph->saddr;
key.iif = skb->dev->ifindex;
#ifdef CONFIG_IP_ROUTE_TOS
key.tos = RT_TOS(ciph->tos);
#endif
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_fw_compat_masq.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c
+--- a/net/ipv4/netfilter/ip_fw_compat_masq.c
++++ b/net/ipv4/netfilter/ip_fw_compat_masq.c
@@ -41,6 +41,10 @@ do_masquerade(struct sk_buff **pskb, con
enum ip_conntrack_info ctinfo;
struct ip_conntrack *ct;
}
void
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_nat_core.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c
+--- a/net/ipv4/netfilter/ip_nat_core.c
++++ b/net/ipv4/netfilter/ip_nat_core.c
@@ -994,6 +994,60 @@ icmp_reply_translation(struct sk_buff *s
return NF_ACCEPT;
}
int __init ip_nat_init(void)
{
size_t i;
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_nat_standalone.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c
+--- a/net/ipv4/netfilter/ip_nat_standalone.c
++++ b/net/ipv4/netfilter/ip_nat_standalone.c
@@ -245,6 +245,9 @@ ip_nat_local_fn(unsigned int hooknum,
/* Before packet filtering, change destination */
static struct nf_hook_ops ip_nat_in_ops
cleanup_inops:
nf_unregister_hook(&ip_nat_in_ops);
cleanup_nat:
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ipt_MASQUERADE.c
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c
+--- a/net/ipv4/netfilter/ipt_MASQUERADE.c
++++ b/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -87,7 +87,8 @@ masquerade_target(struct sk_buff **pskb,
key.dst = (*pskb)->nh.iph->daddr;
key.src = 0; /* Unknown: that's what we're trying to establish */
newsrc = rt->rt_src;
DEBUGP("newsrc = %u.%u.%u.%u\n", NIPQUAD(newsrc));
-Index: linux-2.4.35.4/net/ipv4/route.c
-===================================================================
---- linux-2.4.35.4.orig/net/ipv4/route.c
-+++ linux-2.4.35.4/net/ipv4/route.c
+--- a/net/ipv4/route.c
++++ b/net/ipv4/route.c
@@ -919,6 +919,7 @@ void ip_rt_redirect(u32 old_gw, u32 dadd
/* Gateway is different ... */
#ifdef CONFIG_IP_ROUTE_FWMARK
rth->key.fwmark == key->fwmark &&
#endif
-Index: linux-2.4.35.4/net/netsyms.c
-===================================================================
---- linux-2.4.35.4.orig/net/netsyms.c
-+++ linux-2.4.35.4/net/netsyms.c
+--- a/net/netsyms.c
++++ b/net/netsyms.c
@@ -260,6 +260,7 @@ EXPORT_SYMBOL(inet_register_protosw);
EXPORT_SYMBOL(inet_unregister_protosw);
EXPORT_SYMBOL(ip_route_output_key);
-Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/serial/usbserial.c
-+++ linux-2.4.35.4/drivers/usb/serial/usbserial.c
+--- a/drivers/usb/serial/usbserial.c
++++ b/drivers/usb/serial/usbserial.c
@@ -331,6 +331,7 @@ static void generic_shutdown (struct us
#ifdef CONFIG_USB_SERIAL_GENERIC
static __u16 vendor = 0x05f9;
-Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/usb/serial/usbserial.c
-+++ linux-2.4.35.4/drivers/usb/serial/usbserial.c
+--- a/drivers/usb/serial/usbserial.c
++++ b/drivers/usb/serial/usbserial.c
@@ -333,7 +333,7 @@ static __u16 vendor = 0x05f9;
static __u16 product = 0xffff;
static int maxSize = 0;
-diff -urN linux-2.4.35.4/include/linux/mii.h linux-2.4.35.4.new/include/linux/mii.h
---- linux-2.4.35.4/include/linux/mii.h 2007-11-17 18:23:15.000000000 +0100
-+++ linux-2.4.35.4.new/include/linux/mii.h 2009-03-15 17:32:45.000000000 +0100
+--- a/include/linux/mii.h
++++ b/include/linux/mii.h
@@ -9,7 +9,6 @@
#define __LINUX_MII_H__
struct mii_if_info {
int phy_id;
-@@ -119,9 +131,6 @@
+@@ -119,9 +131,6 @@ struct mii_if_info {
void (*mdio_write) (struct net_device *dev, int phy_id, int location, int val);
};
extern int mii_link_ok (struct mii_if_info *mii);
extern int mii_nway_restart (struct mii_if_info *mii);
extern int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
-@@ -136,15 +145,6 @@
+@@ -136,15 +145,6 @@ extern int generic_mii_ioctl(struct mii_
static inline struct mii_ioctl_data *if_mii(struct ifreq *rq)
{
return (struct mii_ioctl_data *) &rq->ifr_ifru;
-@@ -202,5 +202,5 @@
+@@ -202,5 +202,5 @@ static inline unsigned int mii_duplex (u
return 0;
}
projects / openwrt / staging / hauke.git / commitdiff