diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-19 13:44:11 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-19 13:44:11 +0000 |
| commit | f3016ce71f0bbc04af06b7f8be4a4af0fd0269c2 (patch) | |
| tree | bb2f8298237e911c256cf67f4e6a3d076a2539d1 /target/linux/generic-2.4/patches | |
| parent | 54d696aa99f87871df1eb91cc0abf03962d8eaec (diff) | |
[kernel] refresh generic-2.4 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11213 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.4/patches')
67 files changed, 3767 insertions, 3767 deletions
diff --git a/target/linux/generic-2.4/patches/000-linux_mips.patch b/target/linux/generic-2.4/patches/000-linux_mips.patch index bdc0cdedd0..ea973bdaaa 100644 --- a/target/linux/generic-2.4/patches/000-linux_mips.patch +++ b/target/linux/generic-2.4/patches/000-linux_mips.patch @@ -1,8 +1,8 @@ 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 2007-12-15 05:19:42.862863653 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/au1xxx_irqmap.c 2007-12-15 05:19:44.782973074 +0100 -@@ -172,14 +172,14 @@ +--- 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 +@@ -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}, { AU1550_PSC3_INT, INTC_INT_HIGH_LEVEL, 0}, @@ -25,7 +25,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/au1xxx_irqmap.c { AU1550_NAND_INT, INTC_INT_RISE_EDGE, 0}, { AU1550_USB_DEV_REQ_INT, INTC_INT_HIGH_LEVEL, 0 }, { AU1550_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 }, -@@ -200,14 +200,14 @@ +@@ -200,14 +200,14 @@ au1xxx_irq_map_t au1xxx_ic0_map[] = { { AU1200_PSC1_INT, INTC_INT_HIGH_LEVEL, 0}, { AU1200_AES_INT, INTC_INT_HIGH_LEVEL, 0}, { AU1200_CAMERA_INT, INTC_INT_HIGH_LEVEL, 0}, @@ -50,9 +50,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/au1xxx_irqmap.c { 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 2007-12-15 05:19:42.870864109 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/cputable.c 2007-12-15 05:19:44.786973303 +0100 -@@ -39,7 +39,8 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/common/cputable.c ++++ linux-2.4.35.4/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 }, { 0xffffffff, 0x03030200, "Au1550 AA", 0, 1 }, @@ -64,8 +64,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/cputable.c Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/dbdma.c 2007-12-15 05:19:42.878864567 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/dbdma.c 2007-12-15 05:19:44.786973303 +0100 +--- linux-2.4.35.4.orig/arch/mips/au1000/common/dbdma.c ++++ linux-2.4.35.4/arch/mips/au1000/common/dbdma.c @@ -41,6 +41,8 @@ #include <asm/au1xxx_dbdma.h> #include <asm/system.h> @@ -75,7 +75,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c #if defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) /* -@@ -60,37 +62,10 @@ +@@ -60,37 +62,10 @@ static spinlock_t au1xxx_dbdma_spin_lock */ #define ALIGN_ADDR(x, a) ((((u32)(x)) + (a-1)) & ~(a-1)) @@ -115,7 +115,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c static dbdev_tab_t dbdev_tab[] = { #ifdef CONFIG_SOC_AU1550 /* UARTS */ -@@ -156,13 +131,13 @@ +@@ -156,13 +131,13 @@ static dbdev_tab_t dbdev_tab[] = { { DSCR_CMD0_MAE_BOTH, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, { DSCR_CMD0_LCD, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, @@ -135,7 +135,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c { DSCR_CMD0_PSC0_TX, DEV_FLAGS_OUT, 0, 0, 0x11a0001c, 0, 0 }, { DSCR_CMD0_PSC0_RX, DEV_FLAGS_IN, 0, 0, 0x11a0001c, 0, 0 }, -@@ -172,9 +147,9 @@ +@@ -172,9 +147,9 @@ static dbdev_tab_t dbdev_tab[] = { { DSCR_CMD0_PSC1_RX, DEV_FLAGS_IN, 0, 0, 0x11b0001c, 0, 0 }, { DSCR_CMD0_PSC1_SYNC, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, @@ -148,7 +148,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c { DSCR_CMD0_CIM_SYNC, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, { DSCR_CMD0_NAND_FLASH, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 }, -@@ -183,6 +158,24 @@ +@@ -183,6 +158,24 @@ static dbdev_tab_t dbdev_tab[] = { { DSCR_CMD0_THROTTLE, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, { DSCR_CMD0_ALWAYS, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, @@ -173,7 +173,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c }; #define DBDEV_TAB_SIZE (sizeof(dbdev_tab) / sizeof(dbdev_tab_t)) -@@ -202,6 +195,30 @@ +@@ -202,6 +195,30 @@ find_dbdev_id (u32 id) return NULL; } @@ -204,7 +204,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c /* Allocate a channel and return a non-zero descriptor if successful. */ u32 -@@ -214,7 +231,7 @@ +@@ -214,7 +231,7 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d int i; dbdev_tab_t *stp, *dtp; chan_tab_t *ctp; @@ -213,7 +213,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c /* We do the intialization on the first channel allocation. * We have to wait because of the interrupt handler initialization -@@ -224,9 +241,6 @@ +@@ -224,9 +241,6 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d au1xxx_dbdma_init(); dbdma_initialized = 1; @@ -223,7 +223,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c if ((stp = find_dbdev_id(srcid)) == NULL) return 0; if ((dtp = find_dbdev_id(destid)) == NULL) return 0; -@@ -268,9 +282,9 @@ +@@ -268,9 +282,9 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d /* If kmalloc fails, it is caught below same * as a channel not available. */ @@ -235,7 +235,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c break; } } -@@ -278,10 +292,11 @@ +@@ -278,10 +292,11 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d if (ctp != NULL) { memset(ctp, 0, sizeof(chan_tab_t)); @@ -248,7 +248,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c ctp->chan_src = stp; ctp->chan_dest = dtp; ctp->chan_callback = callback; -@@ -298,6 +313,9 @@ +@@ -298,6 +313,9 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d i |= DDMA_CFG_DED; if (dtp->dev_intpolarity) i |= DDMA_CFG_DP; @@ -258,7 +258,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c cp->ddma_cfg = i; au_sync(); -@@ -308,14 +326,14 @@ +@@ -308,14 +326,14 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 d rv = (u32)(&chan_tab_ptr[chan]); } else { @@ -275,7 +275,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c /* Set the device width if source or destination is a FIFO. * Should be 8, 16, or 32 bits. -@@ -343,6 +361,7 @@ +@@ -343,6 +361,7 @@ au1xxx_dbdma_set_devwidth(u32 chanid, in return rv; } @@ -283,7 +283,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c /* Allocate a descriptor ring, initializing as much as possible. */ -@@ -369,7 +388,8 @@ +@@ -369,7 +388,8 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int * and if we try that first we are likely to not waste larger * slabs of memory. */ @@ -293,7 +293,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c if (desc_base == 0) return 0; -@@ -380,7 +400,7 @@ +@@ -380,7 +400,7 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int kfree((const void *)desc_base); i = entries * sizeof(au1x_ddma_desc_t); i += (sizeof(au1x_ddma_desc_t) - 1); @@ -302,7 +302,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c return 0; desc_base = ALIGN_ADDR(desc_base, sizeof(au1x_ddma_desc_t)); -@@ -460,9 +480,14 @@ +@@ -460,9 +480,14 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int /* If source input is fifo, set static address. */ if (stp->dev_flags & DEV_FLAGS_IN) { @@ -319,7 +319,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c /* Set up dest1. For now, assume no stride and increment. * A channel attribute update can change this later. -@@ -486,10 +511,18 @@ +@@ -486,10 +511,18 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int /* If destination output is fifo, set static address. */ if (dtp->dev_flags & DEV_FLAGS_OUT) { @@ -339,7 +339,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c for (i=0; i<entries; i++) { dp->dscr_cmd0 = cmd0; dp->dscr_cmd1 = cmd1; -@@ -498,6 +531,7 @@ +@@ -498,6 +531,7 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int dp->dscr_dest0 = dest0; dp->dscr_dest1 = dest1; dp->dscr_stat = 0; @@ -347,7 +347,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c dp->dscr_nxtptr = DSCR_NXTPTR(virt_to_phys(dp + 1)); dp++; } -@@ -510,13 +544,14 @@ +@@ -510,13 +544,14 @@ au1xxx_dbdma_ring_alloc(u32 chanid, int return (u32)(ctp->chan_desc_base); } @@ -363,7 +363,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c { chan_tab_t *ctp; au1x_ddma_desc_t *dp; -@@ -543,24 +578,40 @@ +@@ -543,24 +578,40 @@ au1xxx_dbdma_put_source(u32 chanid, void */ dp->dscr_source0 = virt_to_phys(buf); dp->dscr_cmd1 = nbytes; @@ -408,7 +408,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c { chan_tab_t *ctp; au1x_ddma_desc_t *dp; -@@ -582,11 +633,33 @@ +@@ -582,11 +633,33 @@ au1xxx_dbdma_put_dest(u32 chanid, void * if (dp->dscr_cmd0 & DSCR_CMD0_V) return 0; @@ -444,7 +444,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c /* Get next descriptor pointer. */ -@@ -596,6 +669,7 @@ +@@ -596,6 +669,7 @@ au1xxx_dbdma_put_dest(u32 chanid, void * */ return nbytes; } @@ -452,7 +452,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c /* Get a destination buffer into the DMA ring. * Normally used to get a full buffer from the ring during fifo -@@ -645,7 +719,7 @@ +@@ -645,7 +719,7 @@ void au1xxx_dbdma_stop(u32 chanid) { chan_tab_t *ctp; @@ -461,7 +461,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c int halt_timeout = 0; ctp = *((chan_tab_t **)chanid); -@@ -665,6 +739,7 @@ +@@ -665,6 +739,7 @@ au1xxx_dbdma_stop(u32 chanid) cp->ddma_stat |= (DDMA_STAT_DB | DDMA_STAT_V); au_sync(); } @@ -469,7 +469,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c /* Start using the current descriptor pointer. If the dbdma encounters * a not valid descriptor, it will stop. In this case, we can just -@@ -674,17 +749,17 @@ +@@ -674,17 +749,17 @@ void au1xxx_dbdma_start(u32 chanid) { chan_tab_t *ctp; @@ -490,7 +490,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c void au1xxx_dbdma_reset(u32 chanid) -@@ -703,15 +778,21 @@ +@@ -703,15 +778,21 @@ au1xxx_dbdma_reset(u32 chanid) do { dp->dscr_cmd0 &= ~DSCR_CMD0_V; @@ -513,7 +513,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c u32 rv; ctp = *((chan_tab_t **)chanid); -@@ -746,15 +827,16 @@ +@@ -746,15 +827,16 @@ au1xxx_dbdma_chan_free(u32 chanid) kfree(ctp); } @@ -532,7 +532,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c intstat = dbdma_gptr->ddma_intstat; au_sync(); -@@ -773,18 +855,26 @@ +@@ -773,18 +855,26 @@ dbdma_interrupt(int irq, void *dev_id, s (ctp->chan_callback)(irq, ctp->chan_callparam, regs); ctp->cur_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); @@ -563,7 +563,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c "Au1xxx dbdma", (void *)dbdma_gptr)) printk("Can't get 1550 dbdma irq"); } -@@ -795,7 +885,8 @@ +@@ -795,7 +885,8 @@ au1xxx_dbdma_dump(u32 chanid) chan_tab_t *ctp; au1x_ddma_desc_t *dp; dbdev_tab_t *stp, *dtp; @@ -573,7 +573,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c ctp = *((chan_tab_t **)chanid); stp = ctp->chan_src; -@@ -820,15 +911,64 @@ +@@ -820,15 +911,64 @@ au1xxx_dbdma_dump(u32 chanid) dp = ctp->chan_desc_base; do { @@ -646,8 +646,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/dbdma.c Index: linux-2.4.35.4/arch/mips/au1000/common/gpio.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/common/gpio.c 2007-12-15 05:19:44.786973303 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/common/gpio.c @@ -0,0 +1,118 @@ +/* + * This program is free software; you can redistribute it and/or modify it @@ -769,9 +769,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/gpio.c +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 2007-12-15 05:19:42.890865248 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/irq.c 2007-12-15 05:19:44.786973303 +0100 -@@ -303,8 +303,30 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/common/irq.c ++++ linux-2.4.35.4/arch/mips/au1000/common/irq.c +@@ -303,8 +303,30 @@ static struct hw_interrupt_type level_ir }; #ifdef CONFIG_PM @@ -803,7 +803,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/irq.c local_enable_irq(AU1000_TOY_MATCH2_INT); } #endif -@@ -508,6 +530,7 @@ +@@ -508,6 +530,7 @@ void intc0_req0_irqdispatch(struct pt_re if (!intc0_req0) return; @@ -811,7 +811,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/irq.c /* * Because of the tight timing of SETUP token to reply * transactions, the USB devices-side packet complete -@@ -518,6 +541,7 @@ +@@ -518,6 +541,7 @@ void intc0_req0_irqdispatch(struct pt_re do_IRQ(AU1000_USB_DEV_REQ_INT, regs); return; } @@ -819,7 +819,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/irq.c irq = au_ffs(intc0_req0) - 1; intc0_req0 &= ~(1<<irq); -@@ -536,17 +560,7 @@ +@@ -536,17 +560,7 @@ void intc0_req1_irqdispatch(struct pt_re irq = au_ffs(intc0_req1) - 1; intc0_req1 &= ~(1<<irq); @@ -840,9 +840,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/irq.c Index: linux-2.4.35.4/arch/mips/au1000/common/Makefile =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/Makefile 2007-12-15 05:19:42.898865706 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/Makefile 2007-12-15 05:19:44.786973303 +0100 -@@ -19,9 +19,9 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/common/Makefile ++++ linux-2.4.35.4/arch/mips/au1000/common/Makefile +@@ -19,9 +19,9 @@ O_TARGET := au1000.o export-objs = prom.o clocks.o power.o usbdev.o obj-y := prom.o int-handler.o irq.o puts.o time.o reset.o cputable.o \ @@ -856,9 +856,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/Makefile 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 2007-12-15 05:19:42.906866162 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/pci_fixup.c 2007-12-15 05:19:44.790973529 +0100 -@@ -75,9 +75,13 @@ +--- 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 +@@ -75,9 +75,13 @@ void __init pcibios_fixup(void) #ifdef CONFIG_NONCOHERENT_IO /* @@ -876,9 +876,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/pci_fixup.c 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 2007-12-15 05:19:42.910866388 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c 2007-12-15 05:19:44.790973529 +0100 -@@ -162,6 +162,7 @@ +--- 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 +@@ -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) { @@ -886,7 +886,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c #if defined( CONFIG_SOC_AU1500 ) || defined( CONFIG_SOC_AU1550 ) unsigned char bus = dev->bus->number; unsigned int dev_fn = dev->devfn; -@@ -170,7 +171,6 @@ +@@ -170,7 +171,6 @@ static int config_access(unsigned char a unsigned long offset, status; unsigned long cfg_base; unsigned long flags; @@ -894,7 +894,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c unsigned long entryLo0, entryLo1; if (device > 19) { -@@ -205,9 +205,8 @@ +@@ -205,9 +205,8 @@ static int config_access(unsigned char a last_entryLo0 = last_entryLo1 = 0xffffffff; } @@ -906,7 +906,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c */ if (board_pci_idsel) { if (board_pci_idsel(device, 1) == 0) { -@@ -271,8 +270,11 @@ +@@ -271,8 +270,11 @@ static int config_access(unsigned char a } local_irq_restore(flags); @@ -921,8 +921,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/pci_ops.c Index: linux-2.4.35.4/arch/mips/au1000/common/power.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/power.c 2007-12-15 05:19:42.918866846 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/power.c 2007-12-15 05:19:44.790973529 +0100 +--- linux-2.4.35.4.orig/arch/mips/au1000/common/power.c ++++ linux-2.4.35.4/arch/mips/au1000/common/power.c @@ -50,7 +50,6 @@ static void calibrate_delay(void); @@ -931,7 +931,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c extern unsigned int get_au1x00_speed(void); extern unsigned long get_au1x00_uart_baud_base(void); extern void set_au1x00_uart_baud_base(unsigned long new_baud_base); -@@ -116,6 +115,7 @@ +@@ -116,6 +115,7 @@ save_core_regs(void) sleep_uart0_clkdiv = au_readl(UART0_ADDR + UART_CLK); sleep_uart0_enable = au_readl(UART0_ADDR + UART_MOD_CNTRL); @@ -939,7 +939,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c /* Shutdown USB host/device. */ sleep_usbhost_enable = au_readl(USB_HOST_CONFIG); -@@ -127,6 +127,7 @@ +@@ -127,6 +127,7 @@ save_core_regs(void) sleep_usbdev_enable = au_readl(USBD_ENABLE); au_writel(0, USBD_ENABLE); au_sync(); @@ -947,7 +947,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c /* Save interrupt controller state. */ -@@ -212,14 +213,12 @@ +@@ -212,14 +213,12 @@ void wakeup_from_suspend(void) int au_sleep(void) { unsigned long wakeup, flags; @@ -963,7 +963,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c /** The code below is all system dependent and we should probably ** have a function call out of here to set this up. You need ** to configure the GPIO or timer interrupts that will bring -@@ -227,27 +226,26 @@ +@@ -227,27 +226,26 @@ int au_sleep(void) ** For testing, the TOY counter wakeup is useful. **/ @@ -996,7 +996,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c save_and_sleep(); /* after a wakeup, the cpu vectors back to 0x1fc00000 so -@@ -255,6 +253,7 @@ +@@ -255,6 +253,7 @@ int au_sleep(void) */ restore_core_regs(); spin_unlock_irqrestore(&pm_lock, flags); @@ -1004,7 +1004,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c return 0; } -@@ -285,7 +284,6 @@ +@@ -285,7 +284,6 @@ static int pm_do_sleep(ctl_table * ctl, if (retval) return retval; @@ -1012,7 +1012,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c au_sleep(); retval = pm_send_all(PM_RESUME, (void *) 0); } -@@ -296,7 +294,6 @@ +@@ -296,7 +294,6 @@ static int pm_do_suspend(ctl_table * ctl void *buffer, size_t * len) { int retval = 0; @@ -1020,7 +1020,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c if (!write) { *len = 0; -@@ -305,119 +302,9 @@ +@@ -305,119 +302,9 @@ static int pm_do_suspend(ctl_table * ctl if (retval) return retval; suspend_mode = 1; @@ -1141,7 +1141,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c return retval; } -@@ -425,7 +312,6 @@ +@@ -425,7 +312,6 @@ static int pm_do_freq(ctl_table * ctl, i static struct ctl_table pm_table[] = { {ACPI_S1_SLP_TYP, "suspend", NULL, 0, 0600, NULL, &pm_do_suspend}, {ACPI_SLEEP, "sleep", NULL, 0, 0600, NULL, &pm_do_sleep}, @@ -1151,8 +1151,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/power.c Index: linux-2.4.35.4/arch/mips/au1000/common/reset.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/reset.c 2007-12-15 05:19:42.926867302 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/reset.c 2007-12-15 05:19:44.790973529 +0100 +--- linux-2.4.35.4.orig/arch/mips/au1000/common/reset.c ++++ linux-2.4.35.4/arch/mips/au1000/common/reset.c @@ -37,8 +37,6 @@ #include <asm/system.h> #include <asm/au1000.h> @@ -1162,7 +1162,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/reset.c void au1000_restart(char *command) { /* Set all integrated peripherals to disabled states */ -@@ -144,6 +142,26 @@ +@@ -144,6 +142,26 @@ void au1000_restart(char *command) au_writel(0x00, 0xb1900064); /* sys_auxpll */ au_writel(0x00, 0xb1900100); /* sys_pininputen */ break; @@ -1189,7 +1189,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/reset.c default: break; -@@ -163,32 +181,23 @@ +@@ -163,32 +181,23 @@ void au1000_restart(char *command) void au1000_halt(void) { @@ -1235,9 +1235,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/reset.c } Index: linux-2.4.35.4/arch/mips/au1000/common/setup.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/setup.c 2007-12-15 05:19:42.934867757 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/setup.c 2007-12-15 05:19:44.794973758 +0100 -@@ -174,6 +174,40 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/common/setup.c ++++ linux-2.4.35.4/arch/mips/au1000/common/setup.c +@@ -174,6 +174,40 @@ void __init au1x00_setup(void) initrd_end = (unsigned long)&__rd_end; #endif @@ -1278,7 +1278,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/setup.c #if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE) #ifdef CONFIG_USB_OHCI if ((argptr = strstr(argptr, "usb_ohci=")) == NULL) { -@@ -187,19 +221,38 @@ +@@ -187,19 +221,38 @@ void __init au1x00_setup(void) #endif #ifdef CONFIG_USB_OHCI @@ -1321,7 +1321,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/setup.c conswitchp = &dummy_con; #endif -@@ -209,8 +262,7 @@ +@@ -209,8 +262,7 @@ void __init au1x00_setup(void) #endif #ifdef CONFIG_BLK_DEV_IDE @@ -1333,8 +1333,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/setup.c #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 2007-12-15 05:19:42.938867986 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/sleeper.S 2007-12-15 05:19:44.794973758 +0100 +--- linux-2.4.35.4.orig/arch/mips/au1000/common/sleeper.S ++++ linux-2.4.35.4/arch/mips/au1000/common/sleeper.S @@ -15,17 +15,48 @@ #include <asm/addrspace.h> #include <asm/regdef.h> @@ -1389,7 +1389,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/sleeper.S subu sp, PT_SIZE sw $1, PT_R1(sp) sw $2, PT_R2(sp) -@@ -34,14 +65,6 @@ +@@ -34,14 +65,6 @@ LEAF(save_and_sleep) sw $5, PT_R5(sp) sw $6, PT_R6(sp) sw $7, PT_R7(sp) @@ -1404,7 +1404,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/sleeper.S sw $16, PT_R16(sp) sw $17, PT_R17(sp) sw $18, PT_R18(sp) -@@ -50,32 +73,47 @@ +@@ -50,32 +73,47 @@ LEAF(save_and_sleep) sw $21, PT_R21(sp) sw $22, PT_R22(sp) sw $23, PT_R23(sp) @@ -1467,7 +1467,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/sleeper.S /* Put SDRAM into self refresh. Preload instructions into cache, * issue a precharge, then auto refresh, then sleep commands to it. -@@ -88,30 +126,65 @@ +@@ -88,30 +126,65 @@ LEAF(save_and_sleep) cache 0x14, 96(t0) .set mips0 @@ -1546,7 +1546,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/sleeper.S mtc0 k0, CP0_CONFIG lw $1, PT_R1(sp) lw $2, PT_R2(sp) -@@ -120,14 +193,6 @@ +@@ -120,14 +193,6 @@ sdsleep: lw $5, PT_R5(sp) lw $6, PT_R6(sp) lw $7, PT_R7(sp) @@ -1561,7 +1561,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/sleeper.S lw $16, PT_R16(sp) lw $17, PT_R17(sp) lw $18, PT_R18(sp) -@@ -136,15 +201,36 @@ +@@ -136,15 +201,36 @@ sdsleep: lw $21, PT_R21(sp) lw $22, PT_R22(sp) lw $23, PT_R23(sp) @@ -1605,8 +1605,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/sleeper.S + Index: linux-2.4.35.4/arch/mips/au1000/common/time.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/common/time.c 2007-12-15 05:19:42.946868441 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/common/time.c 2007-12-15 05:19:44.794973758 +0100 +--- linux-2.4.35.4.orig/arch/mips/au1000/common/time.c ++++ linux-2.4.35.4/arch/mips/au1000/common/time.c @@ -50,7 +50,6 @@ #include <linux/mc146818rtc.h> #include <linux/timex.h> @@ -1615,7 +1615,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/time.c extern void do_softirq(void); extern volatile unsigned long wall_jiffies; unsigned long missed_heart_beats = 0; -@@ -59,14 +58,14 @@ +@@ -59,14 +58,14 @@ static unsigned long r4k_offset; /* Amou static unsigned long r4k_cur; /* What counter should be at next timer irq */ extern rwlock_t xtime_lock; int no_au1xxx_32khz; @@ -1632,7 +1632,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/time.c static unsigned long last_pc0, last_match20; #endif -@@ -385,7 +384,6 @@ +@@ -385,7 +384,6 @@ void __init au1xxx_timer_setup(void) { unsigned int est_freq; extern unsigned long (*do_gettimeoffset)(void); @@ -1640,7 +1640,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/time.c printk("calculating r4koff... "); r4k_offset = cal_r4koff(); -@@ -437,9 +435,6 @@ +@@ -437,9 +435,6 @@ void __init au1xxx_timer_setup(void) au_writel(0, SYS_TOYWRITE); while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S); @@ -1650,7 +1650,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/time.c while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20); /* setup match20 to interrupt once every 10ms */ -@@ -447,13 +442,13 @@ +@@ -447,13 +442,13 @@ void __init au1xxx_timer_setup(void) au_writel(last_match20 + MATCH20_INC, SYS_TOYMATCH2); au_sync(); while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20); @@ -1668,8 +1668,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/common/time.c #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 2007-12-15 05:19:42.954868897 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/db1x00/board_setup.c 2007-12-15 05:19:44.794973758 +0100 +--- 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 @@ -46,10 +46,22 @@ #include <asm/au1000.h> #include <asm/db1x00.h> @@ -1696,7 +1696,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/db1x00/board_setup.c void board_reset (void) { -@@ -57,6 +69,13 @@ +@@ -57,6 +69,13 @@ void board_reset (void) au_writel(0x00000000, 0xAE00001C); } @@ -1710,7 +1710,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/db1x00/board_setup.c void __init board_setup(void) { u32 pin_func; -@@ -108,8 +127,42 @@ +@@ -108,8 +127,42 @@ void __init board_setup(void) au_writel(0x02000200, GPIO2_OUTPUT); #endif @@ -1755,9 +1755,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/db1x00/board_setup.c #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 2007-12-15 05:19:42.962869352 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/db1x00/irqmap.c 2007-12-15 05:19:44.794973758 +0100 -@@ -53,6 +53,7 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/db1x00/irqmap.c ++++ linux-2.4.35.4/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# { AU1000_GPIO_5, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 1 IRQ# @@ -1767,9 +1767,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/db1x00/irqmap.c { 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 2007-12-15 05:19:42.970869808 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/db1x00/Makefile 2007-12-15 05:19:44.794973758 +0100 -@@ -17,4 +17,11 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/db1x00/Makefile ++++ linux-2.4.35.4/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 @@ -1783,8 +1783,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/db1x00/Makefile include $(TOPDIR)/Rules.make Index: linux-2.4.35.4/arch/mips/au1000/db1x00/mmc_support.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/db1x00/mmc_support.c 2007-12-15 05:19:44.798973987 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/db1x00/mmc_support.c @@ -0,0 +1,126 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -1914,8 +1914,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/db1x00/mmc_support.c + Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/au1200_ibutton.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/au1200_ibutton.c 2007-12-15 05:19:44.798973987 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/au1200_ibutton.c @@ -0,0 +1,270 @@ +/* ---------------------------------------------------------------------- + * mtwilson_keys.c @@ -2189,8 +2189,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/au1200_ibutton.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/au1xxx_dock.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/au1xxx_dock.c 2007-12-15 05:19:44.798973987 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/au1xxx_dock.c @@ -0,0 +1,261 @@ +/* + * Copyright (C) 2003 Metrowerks, All Rights Reserved. @@ -2455,8 +2455,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/au1xxx_dock.c +module_exit(au1xxx_dock_exit); Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/board_setup.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/board_setup.c 2007-12-15 05:19:44.798973987 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/board_setup.c @@ -0,0 +1,226 @@ +/* + * @@ -2686,8 +2686,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/board_setup.c + Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/init.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/init.c 2007-12-15 05:19:44.802974213 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/init.c @@ -0,0 +1,76 @@ +/* + * @@ -2767,8 +2767,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/init.c + Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/irqmap.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/irqmap.c 2007-12-15 05:19:44.802974213 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/irqmap.c @@ -0,0 +1,61 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -2833,8 +2833,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/irqmap.c + Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/Makefile =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/ficmmp/Makefile 2007-12-15 05:19:44.802974213 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/ficmmp/Makefile @@ -0,0 +1,25 @@ +# +# Copyright 2000 MontaVista Software Inc. @@ -2863,9 +2863,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/ficmmp/Makefile +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 2007-12-15 05:19:43.014872316 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/board_setup.c 2007-12-15 05:19:44.802974213 +0100 -@@ -51,12 +51,19 @@ +--- 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 +@@ -51,12 +51,19 @@ void board_reset (void) { } @@ -2887,8 +2887,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/board_setup.c pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000); Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/buttons.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/buttons.c 2007-12-15 05:19:44.802974213 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/buttons.c @@ -0,0 +1,308 @@ +/* + * Copyright (C) 2003 Metrowerks, All Rights Reserved. @@ -3200,9 +3200,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/buttons.c +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 2007-12-15 05:19:43.026873001 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/Makefile 2007-12-15 05:19:44.802974213 +0100 -@@ -14,6 +14,11 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/hydrogen3/Makefile ++++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/Makefile +@@ -14,6 +14,11 @@ USE_STANDARD_AS_RULE := true O_TARGET := hydrogen3.o @@ -3217,8 +3217,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/Makefile include $(TOPDIR)/Rules.make Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/mmc_support.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/mmc_support.c 2007-12-15 05:19:44.802974213 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/hydrogen3/mmc_support.c @@ -0,0 +1,89 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -3311,8 +3311,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/hydrogen3/mmc_support.c + 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 2007-12-15 05:19:43.038873685 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/mtx-1/board_setup.c 2007-12-15 05:19:44.806974443 +0100 +--- 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 @@ -48,6 +48,12 @@ extern struct rtc_ops no_rtc_ops; @@ -3328,9 +3328,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/mtx-1/board_setup.c 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 2007-12-15 05:19:43.046874140 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/mtx-1/irqmap.c 2007-12-15 05:19:44.806974443 +0100 -@@ -72,10 +72,10 @@ +--- 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 +@@ -72,10 +72,10 @@ au1xxx_pci_irqmap(struct pci_dev *dev, u * A B C D */ { @@ -3347,9 +3347,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/mtx-1/irqmap.c 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 2007-12-15 05:19:43.054874596 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/pb1000/board_setup.c 2007-12-15 05:19:44.806974443 +0100 -@@ -58,6 +58,10 @@ +--- 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 +@@ -58,6 +58,10 @@ void board_reset (void) { } @@ -3362,9 +3362,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1000/board_setup.c 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 2007-12-15 05:19:43.062875051 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/pb1100/board_setup.c 2007-12-15 05:19:44.806974443 +0100 -@@ -62,6 +62,10 @@ +--- 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 +@@ -62,6 +62,10 @@ void board_reset (void) au_writel(0x00000000, 0xAE00001C); } @@ -3377,9 +3377,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1100/board_setup.c 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 2007-12-15 05:19:43.070875507 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/pb1100/Makefile 2007-12-15 05:19:44.806974443 +0100 -@@ -16,4 +16,10 @@ +--- linux-2.4.35.4.orig/arch/mips/au1000/pb1100/Makefile ++++ linux-2.4.35.4/arch/mips/au1000/pb1100/Makefile +@@ -16,4 +16,10 @@ O_TARGET := pb1100.o obj-y := init.o board_setup.o irqmap.o @@ -3392,8 +3392,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1100/Makefile include $(TOPDIR)/Rules.make Index: linux-2.4.35.4/arch/mips/au1000/pb1100/mmc_support.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/pb1100/mmc_support.c 2007-12-15 05:19:44.806974443 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/pb1100/mmc_support.c @@ -0,0 +1,126 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -3523,8 +3523,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1100/mmc_support.c + Index: linux-2.4.35.4/arch/mips/au1000/pb1200/board_setup.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/pb1200/board_setup.c 2007-12-15 05:19:44.810974669 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/pb1200/board_setup.c @@ -0,0 +1,221 @@ +/* + * @@ -3749,8 +3749,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1200/board_setup.c + Index: linux-2.4.35.4/arch/mips/au1000/pb1200/init.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/pb1200/init.c 2007-12-15 05:19:44.810974669 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/pb1200/init.c @@ -0,0 +1,72 @@ +/* + * @@ -3826,8 +3826,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1200/init.c + Index: linux-2.4.35.4/arch/mips/au1000/pb1200/irqmap.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/pb1200/irqmap.c 2007-12-15 05:19:44.810974669 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/pb1200/irqmap.c @@ -0,0 +1,180 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -4011,8 +4011,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1200/irqmap.c + Index: linux-2.4.35.4/arch/mips/au1000/pb1200/Makefile =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/pb1200/Makefile 2007-12-15 05:19:44.810974669 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/pb1200/Makefile @@ -0,0 +1,25 @@ +# +# Copyright 2000 MontaVista Software Inc. @@ -4041,8 +4041,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1200/Makefile +include $(TOPDIR)/Rules.make Index: linux-2.4.35.4/arch/mips/au1000/pb1200/mmc_support.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/au1000/pb1200/mmc_support.c 2007-12-15 05:19:44.810974669 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/au1000/pb1200/mmc_support.c @@ -0,0 +1,141 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -4187,9 +4187,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1200/mmc_support.c + 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 2007-12-15 05:19:43.110877786 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/pb1500/board_setup.c 2007-12-15 05:19:44.810974669 +0100 -@@ -62,6 +62,10 @@ +--- 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 +@@ -62,6 +62,10 @@ void board_reset (void) au_writel(0x00000000, 0xAE00001C); } @@ -4202,8 +4202,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1500/board_setup.c 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 2007-12-15 05:19:43.118878244 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/pb1550/board_setup.c 2007-12-15 05:19:44.814974898 +0100 +--- 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 @@ -48,12 +48,31 @@ extern struct rtc_ops no_rtc_ops; @@ -4236,7 +4236,7 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1550/board_setup.c void __init board_setup(void) { u32 pin_func; -@@ -78,5 +97,36 @@ +@@ -78,5 +97,36 @@ void __init board_setup(void) au_writel(0, (u32)bcsr|0x10); /* turn off pcmcia power */ au_sync(); @@ -4275,8 +4275,8 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1550/board_setup.c } Index: linux-2.4.35.4/arch/mips/au1000/pb1550/irqmap.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/au1000/pb1550/irqmap.c 2007-12-15 05:19:43.126878700 +0100 -+++ linux-2.4.35.4/arch/mips/au1000/pb1550/irqmap.c 2007-12-15 05:19:44.814974898 +0100 +--- linux-2.4.35.4.orig/arch/mips/au1000/pb1550/irqmap.c ++++ linux-2.4.35.4/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 }, @@ -4289,9 +4289,9 @@ Index: linux-2.4.35.4/arch/mips/au1000/pb1550/irqmap.c 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 2007-12-15 05:19:43.134879155 +0100 -+++ linux-2.4.35.4/arch/mips/config-shared.in 2007-12-15 05:19:44.814974898 +0100 -@@ -21,16 +21,19 @@ +--- linux-2.4.35.4.orig/arch/mips/config-shared.in ++++ linux-2.4.35.4/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 dep_bool 'Support for Alchemy Bosporus board' CONFIG_MIPS_BOSPORUS $CONFIG_MIPS32 @@ -4312,7 +4312,7 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in dep_bool 'Support for MyCable XXS1500 board' CONFIG_MIPS_XXS1500 $CONFIG_MIPS32 dep_bool 'Support for 4G Systems MTX-1 board' CONFIG_MIPS_MTX1 $CONFIG_MIPS32 dep_bool 'Support for Cogent CSB250 board' CONFIG_COGENT_CSB250 $CONFIG_MIPS32 -@@ -249,6 +252,12 @@ +@@ -249,6 +252,12 @@ if [ "$CONFIG_MIPS_MIRAGE" = "y" ]; then define_bool CONFIG_PC_KEYB y define_bool CONFIG_NONCOHERENT_IO y fi @@ -4325,7 +4325,7 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in if [ "$CONFIG_MIPS_BOSPORUS" = "y" ]; then define_bool CONFIG_SOC_AU1X00 y define_bool CONFIG_SOC_AU1500 y -@@ -263,6 +272,12 @@ +@@ -263,6 +272,12 @@ if [ "$CONFIG_MIPS_PB1000" = "y" ]; then define_bool CONFIG_SWAP_IO_SPACE_W y define_bool CONFIG_SWAP_IO_SPACE_L y fi @@ -4338,7 +4338,7 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in if [ "$CONFIG_MIPS_PB1100" = "y" ]; then define_bool CONFIG_SOC_AU1X00 y define_bool CONFIG_SOC_AU1100 y -@@ -271,9 +286,15 @@ +@@ -271,9 +286,15 @@ if [ "$CONFIG_MIPS_PB1100" = "y" ]; then define_bool CONFIG_SWAP_IO_SPACE_W y define_bool CONFIG_SWAP_IO_SPACE_L y fi @@ -4356,7 +4356,7 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in define_bool CONFIG_NONCOHERENT_IO y define_bool CONFIG_PC_KEYB y fi -@@ -290,18 +311,24 @@ +@@ -290,18 +311,24 @@ if [ "$CONFIG_MIPS_DB1500" = "y" ]; then define_bool CONFIG_NONCOHERENT_IO y define_bool CONFIG_PC_KEYB y fi @@ -4384,7 +4384,7 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in fi if [ "$CONFIG_MIPS_HYDROGEN3" = "y" ]; then define_bool CONFIG_SOC_AU1X00 y -@@ -327,12 +354,6 @@ +@@ -327,12 +354,6 @@ if [ "$CONFIG_COGENT_CSB250" = "y" ]; th define_bool CONFIG_NONCOHERENT_IO y define_bool CONFIG_PC_KEYB y fi @@ -4397,7 +4397,7 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in if [ "$CONFIG_MIPS_COBALT" = "y" ]; then define_bool CONFIG_BOOT_ELF32 y define_bool CONFIG_COBALT_LCD y -@@ -729,6 +750,13 @@ +@@ -729,6 +750,13 @@ if [ "$CONFIG_ACER_PICA_61" = "y" -o \ "$CONFIG_MIPS_PB1000" = "y" -o \ "$CONFIG_MIPS_PB1100" = "y" -o \ "$CONFIG_MIPS_PB1500" = "y" -o \ @@ -4413,9 +4413,9 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in "$CONFIG_NINO" = "y" -o \ Index: linux-2.4.35.4/arch/mips/defconfig =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig 2007-12-15 05:19:43.142879610 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig 2007-12-15 05:19:44.814974898 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig ++++ linux-2.4.35.4/arch/mips/defconfig +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -4425,7 +4425,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -235,11 +235,6 @@ +@@ -235,11 +235,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -4437,7 +4437,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -319,9 +314,11 @@ +@@ -319,9 +314,11 @@ CONFIG_SGIWD93_SCSI=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -4449,7 +4449,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -465,7 +462,6 @@ +@@ -465,7 +462,6 @@ CONFIG_VT_CONSOLE=y # CONFIG_SERIAL is not set # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -4459,9 +4459,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig Index: linux-2.4.35.4/arch/mips/defconfig-atlas =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-atlas 2007-12-15 05:19:43.150880066 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-atlas 2007-12-15 05:19:44.818975127 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-atlas ++++ linux-2.4.35.4/arch/mips/defconfig-atlas +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -4471,7 +4471,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-atlas # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -235,11 +235,6 @@ +@@ -235,11 +235,6 @@ CONFIG_IP_PNP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -4483,7 +4483,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-atlas # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -317,9 +312,11 @@ +@@ -317,9 +312,11 @@ CONFIG_SD_EXTRA_DEVS=40 # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -4495,7 +4495,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-atlas # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -528,7 +525,6 @@ +@@ -528,7 +525,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -4505,9 +4505,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-atlas Index: linux-2.4.35.4/arch/mips/defconfig-bosporus =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-bosporus 2007-12-15 05:19:43.158880524 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-bosporus 2007-12-15 05:19:44.818975127 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-bosporus ++++ linux-2.4.35.4/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_MIPS_PB1500 is not set @@ -4517,7 +4517,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-bosporus # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -208,9 +208,7 @@ +@@ -208,9 +208,7 @@ CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_BOSPORUS=y # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -4527,7 +4527,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-bosporus # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -229,7 +227,6 @@ +@@ -229,7 +227,6 @@ CONFIG_MTD_BOSPORUS=y # # Disk-On-Chip Device Drivers # @@ -4535,7 +4535,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-bosporus # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -373,11 +370,6 @@ +@@ -373,11 +370,6 @@ CONFIG_IP_NF_MANGLE=m # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -4547,7 +4547,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-bosporus # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -457,9 +449,11 @@ +@@ -457,9 +449,11 @@ CONFIG_SCSI_CONSTANTS=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -4559,7 +4559,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-bosporus # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -681,7 +675,6 @@ +@@ -681,7 +675,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -4569,9 +4569,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-bosporus Index: linux-2.4.35.4/arch/mips/defconfig-capcella =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-capcella 2007-12-15 05:19:43.162880750 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-capcella 2007-12-15 05:19:44.818975127 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-capcella ++++ linux-2.4.35.4/arch/mips/defconfig-capcella +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -4581,7 +4581,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-capcella # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -228,11 +228,6 @@ +@@ -228,11 +228,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -4593,7 +4593,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-capcella # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -472,7 +467,6 @@ +@@ -472,7 +467,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -4603,9 +4603,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-capcella 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 2007-12-15 05:19:43.170881205 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-cobalt 2007-12-15 05:19:44.818975127 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-cobalt ++++ linux-2.4.35.4/arch/mips/defconfig-cobalt +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -4615,7 +4615,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-cobalt # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -222,11 +222,6 @@ +@@ -222,11 +222,6 @@ CONFIG_INET=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -4627,7 +4627,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-cobalt # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -505,7 +500,6 @@ +@@ -505,7 +500,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -4637,9 +4637,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-cobalt Index: linux-2.4.35.4/arch/mips/defconfig-csb250 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-csb250 2007-12-15 05:19:43.178881664 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-csb250 2007-12-15 05:19:44.818975127 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-csb250 ++++ linux-2.4.35.4/arch/mips/defconfig-csb250 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -4649,7 +4649,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-csb250 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set CONFIG_COGENT_CSB250=y -@@ -268,11 +268,6 @@ +@@ -268,11 +268,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -4661,7 +4661,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-csb250 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -556,7 +551,6 @@ +@@ -556,7 +551,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -4671,9 +4671,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-csb250 Index: linux-2.4.35.4/arch/mips/defconfig-db1000 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-db1000 2007-12-15 05:19:43.186882119 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-db1000 2007-12-15 05:19:44.822975353 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-db1000 ++++ linux-2.4.35.4/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_MIPS_PB1500 is not set @@ -4683,7 +4683,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1000 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -214,11 +214,7 @@ +@@ -214,11 +214,7 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -4695,7 +4695,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1000 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -237,7 +233,6 @@ +@@ -237,7 +233,6 @@ CONFIG_MTD_DB1X00_USER=y # # Disk-On-Chip Device Drivers # @@ -4703,7 +4703,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1000 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -342,11 +337,6 @@ +@@ -342,11 +337,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -4715,7 +4715,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1000 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -636,7 +626,6 @@ +@@ -636,7 +626,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -4725,9 +4725,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1000 Index: linux-2.4.35.4/arch/mips/defconfig-db1100 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-db1100 2007-12-15 05:19:43.190882345 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-db1100 2007-12-15 05:19:44.822975353 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-db1100 ++++ linux-2.4.35.4/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_MIPS_PB1500 is not set @@ -4737,7 +4737,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1100 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -214,11 +214,7 @@ +@@ -214,11 +214,7 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -4749,7 +4749,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1100 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -237,7 +233,6 @@ +@@ -237,7 +233,6 @@ CONFIG_MTD_DB1X00_USER=y # # Disk-On-Chip Device Drivers # @@ -4757,7 +4757,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1100 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -342,11 +337,6 @@ +@@ -342,11 +337,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -4769,7 +4769,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1100 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -636,7 +626,6 @@ +@@ -636,7 +626,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -4777,7 +4777,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1100 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -@@ -884,6 +873,7 @@ +@@ -884,6 +873,7 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_FB_PM2 is not set # CONFIG_FB_PM3 is not set # CONFIG_FB_CYBER2000 is not set @@ -4785,7 +4785,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1100 # CONFIG_FB_MATROX is not set # CONFIG_FB_ATY is not set # CONFIG_FB_RADEON is not set -@@ -895,7 +885,6 @@ +@@ -895,7 +885,6 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_E1356 is not set @@ -4795,8 +4795,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1100 CONFIG_FBCON_ADVANCED=y Index: linux-2.4.35.4/arch/mips/defconfig-db1200 =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/defconfig-db1200 2007-12-15 05:19:44.822975353 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/defconfig-db1200 @@ -0,0 +1,1032 @@ +# +# Automatically generated make config: don't edit @@ -5832,9 +5832,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1200 +# 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 2007-12-15 05:19:43.202883030 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-db1500 2007-12-15 05:19:44.826975582 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-db1500 ++++ linux-2.4.35.4/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_MIPS_PB1500 is not set @@ -5844,7 +5844,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1500 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -267,11 +267,6 @@ +@@ -267,11 +267,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -5856,7 +5856,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1500 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -555,7 +550,6 @@ +@@ -555,7 +550,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -5866,9 +5866,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1500 Index: linux-2.4.35.4/arch/mips/defconfig-db1550 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-db1550 2007-12-15 05:19:43.210883485 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-db1550 2007-12-15 05:19:44.826975582 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-db1550 ++++ linux-2.4.35.4/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_MIPS_PB1500 is not set @@ -5878,7 +5878,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1550 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -213,11 +213,9 @@ +@@ -213,11 +213,9 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -5890,7 +5890,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1550 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -236,7 +234,6 @@ +@@ -236,7 +234,6 @@ CONFIG_MTD_PB1550_USER=y # # Disk-On-Chip Device Drivers # @@ -5898,7 +5898,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1550 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -343,11 +340,6 @@ +@@ -343,11 +340,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -5910,7 +5910,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1550 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -633,7 +625,6 @@ +@@ -633,7 +625,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -5920,9 +5920,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-db1550 Index: linux-2.4.35.4/arch/mips/defconfig-ddb5476 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ddb5476 2007-12-15 05:19:43.218883943 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-ddb5476 2007-12-15 05:19:44.826975582 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-ddb5476 ++++ linux-2.4.35.4/arch/mips/defconfig-ddb5476 +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -5932,7 +5932,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ddb5476 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -226,11 +226,6 @@ +@@ -226,11 +226,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -5944,7 +5944,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ddb5476 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -517,7 +512,6 @@ +@@ -517,7 +512,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -5954,9 +5954,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ddb5476 Index: linux-2.4.35.4/arch/mips/defconfig-ddb5477 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ddb5477 2007-12-15 05:19:43.226884399 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-ddb5477 2007-12-15 05:19:44.826975582 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-ddb5477 ++++ linux-2.4.35.4/arch/mips/defconfig-ddb5477 +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -5966,7 +5966,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ddb5477 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -226,11 +226,6 @@ +@@ -226,11 +226,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -5978,7 +5978,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ddb5477 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -434,7 +429,6 @@ +@@ -434,7 +429,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -5988,9 +5988,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ddb5477 Index: linux-2.4.35.4/arch/mips/defconfig-decstation =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-decstation 2007-12-15 05:19:43.234884854 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-decstation 2007-12-15 05:19:44.826975582 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-decstation ++++ linux-2.4.35.4/arch/mips/defconfig-decstation +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -6000,7 +6000,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-decstation # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -223,11 +223,6 @@ +@@ -223,11 +223,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -6012,7 +6012,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-decstation # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -306,9 +301,11 @@ +@@ -306,9 +301,11 @@ CONFIG_SCSI_DECNCR=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -6024,7 +6024,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-decstation # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -477,7 +474,6 @@ +@@ -477,7 +474,6 @@ CONFIG_SERIAL_DEC=y CONFIG_SERIAL_DEC_CONSOLE=y CONFIG_DZ=y CONFIG_ZS=y @@ -6034,9 +6034,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-decstation Index: linux-2.4.35.4/arch/mips/defconfig-e55 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-e55 2007-12-15 05:19:43.242885309 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-e55 2007-12-15 05:19:44.830975809 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-e55 ++++ linux-2.4.35.4/arch/mips/defconfig-e55 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -6046,7 +6046,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-e55 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -222,11 +222,6 @@ +@@ -222,11 +222,6 @@ CONFIG_IP_MULTICAST=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -6058,7 +6058,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-e55 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -426,7 +421,6 @@ +@@ -426,7 +421,6 @@ CONFIG_SERIAL_MANY_PORTS=y # CONFIG_SERIAL_MULTIPORT is not set # CONFIG_HUB6 is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -6068,9 +6068,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-e55 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 2007-12-15 05:19:43.246885538 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-eagle 2007-12-15 05:19:44.830975809 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-eagle ++++ linux-2.4.35.4/arch/mips/defconfig-eagle +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -6080,7 +6080,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-eagle # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -208,8 +208,8 @@ +@@ -208,8 +208,8 @@ CONFIG_MTD_CFI_INTELEXT=y # Mapping drivers for chip access # CONFIG_MTD_PHYSMAP=y @@ -6091,7 +6091,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-eagle CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # CONFIG_MTD_PB1000 is not set # CONFIG_MTD_PB1500 is not set -@@ -217,9 +217,7 @@ +@@ -217,9 +217,7 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -6101,7 +6101,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-eagle # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -238,7 +236,6 @@ +@@ -238,7 +236,6 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # # Disk-On-Chip Device Drivers # @@ -6109,7 +6109,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-eagle # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -327,11 +324,6 @@ +@@ -327,11 +324,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -6121,7 +6121,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-eagle # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -587,7 +579,6 @@ +@@ -587,7 +579,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -6131,9 +6131,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-eagle 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 2007-12-15 05:19:43.254885994 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-ev64120 2007-12-15 05:19:44.830975809 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-ev64120 ++++ linux-2.4.35.4/arch/mips/defconfig-ev64120 +@@ -30,8 +30,8 @@ CONFIG_MODULES=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -6143,7 +6143,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ev64120 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -230,11 +230,6 @@ +@@ -230,11 +230,6 @@ CONFIG_IP_PNP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -6155,7 +6155,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ev64120 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -443,7 +438,6 @@ +@@ -443,7 +438,6 @@ CONFIG_SERIAL=y # CONFIG_SERIAL_CONSOLE is not set # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -6165,9 +6165,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ev64120 Index: linux-2.4.35.4/arch/mips/defconfig-ev96100 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ev96100 2007-12-15 05:19:43.262886449 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-ev96100 2007-12-15 05:19:44.830975809 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-ev96100 ++++ linux-2.4.35.4/arch/mips/defconfig-ev96100 +@@ -30,8 +30,8 @@ CONFIG_MODULES=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -6177,7 +6177,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ev96100 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -232,11 +232,6 @@ +@@ -232,11 +232,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -6189,7 +6189,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ev96100 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -441,7 +436,6 @@ +@@ -441,7 +436,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -6199,8 +6199,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ev96100 Index: linux-2.4.35.4/arch/mips/defconfig-ficmmp =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/defconfig-ficmmp 2007-12-15 05:19:44.834976038 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/defconfig-ficmmp @@ -0,0 +1,862 @@ +# +# Automatically generated make config: don't edit @@ -7066,9 +7066,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ficmmp +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 2007-12-15 05:19:43.274887133 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-hp-lj 2007-12-15 05:19:44.834976038 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-hp-lj ++++ linux-2.4.35.4/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_MIPS_PB1500 is not set @@ -7078,7 +7078,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hp-lj # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -184,8 +184,8 @@ +@@ -184,8 +184,8 @@ CONFIG_MTD_CFI_AMDSTD=y # Mapping drivers for chip access # CONFIG_MTD_PHYSMAP=y @@ -7089,7 +7089,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hp-lj CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # CONFIG_MTD_PB1000 is not set # CONFIG_MTD_PB1500 is not set -@@ -193,9 +193,7 @@ +@@ -193,9 +193,7 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -7099,7 +7099,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hp-lj # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -214,7 +212,6 @@ +@@ -214,7 +212,6 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # # Disk-On-Chip Device Drivers # @@ -7107,7 +7107,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hp-lj # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -304,11 +301,6 @@ +@@ -304,11 +301,6 @@ CONFIG_IP_PNP_DHCP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7119,7 +7119,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hp-lj # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -604,7 +596,6 @@ +@@ -604,7 +596,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -7129,9 +7129,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hp-lj # Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-hydrogen3 2007-12-15 05:19:43.282887589 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-hydrogen3 2007-12-15 05:19:44.834976038 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-hydrogen3 ++++ linux-2.4.35.4/arch/mips/defconfig-hydrogen3 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7141,7 +7141,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -214,9 +214,7 @@ +@@ -214,9 +214,7 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -7151,7 +7151,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -235,7 +233,6 @@ +@@ -235,7 +233,6 @@ CONFIG_MTD_HYDROGEN3=y # # Disk-On-Chip Device Drivers # @@ -7159,7 +7159,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -340,11 +337,6 @@ +@@ -340,11 +337,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7171,7 +7171,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -590,7 +582,6 @@ +@@ -590,7 +582,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -7179,7 +7179,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -@@ -838,6 +829,7 @@ +@@ -838,6 +829,7 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_FB_PM2 is not set # CONFIG_FB_PM3 is not set # CONFIG_FB_CYBER2000 is not set @@ -7187,7 +7187,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3 # CONFIG_FB_MATROX is not set # CONFIG_FB_ATY is not set # CONFIG_FB_RADEON is not set -@@ -849,7 +841,6 @@ +@@ -849,7 +841,6 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_E1356 is not set @@ -7197,9 +7197,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-hydrogen3 CONFIG_FBCON_ADVANCED=y Index: linux-2.4.35.4/arch/mips/defconfig-ip22 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ip22 2007-12-15 05:19:43.290888044 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-ip22 2007-12-15 05:19:44.834976038 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-ip22 ++++ linux-2.4.35.4/arch/mips/defconfig-ip22 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7209,7 +7209,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ip22 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -235,11 +235,6 @@ +@@ -235,11 +235,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7221,7 +7221,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ip22 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -319,9 +314,11 @@ +@@ -319,9 +314,11 @@ CONFIG_SGIWD93_SCSI=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -7233,7 +7233,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ip22 # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -465,7 +462,6 @@ +@@ -465,7 +462,6 @@ CONFIG_VT_CONSOLE=y # CONFIG_SERIAL is not set # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -7243,9 +7243,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ip22 Index: linux-2.4.35.4/arch/mips/defconfig-it8172 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-it8172 2007-12-15 05:19:43.294888273 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-it8172 2007-12-15 05:19:44.838976267 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-it8172 ++++ linux-2.4.35.4/arch/mips/defconfig-it8172 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7255,7 +7255,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-it8172 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -186,8 +186,8 @@ +@@ -186,8 +186,8 @@ CONFIG_MTD_CFI_INTELEXT=y # Mapping drivers for chip access # CONFIG_MTD_PHYSMAP=y @@ -7266,7 +7266,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-it8172 CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # CONFIG_MTD_PB1000 is not set # CONFIG_MTD_PB1500 is not set -@@ -195,9 +195,7 @@ +@@ -195,9 +195,7 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -7276,7 +7276,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-it8172 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -216,7 +214,6 @@ +@@ -216,7 +214,6 @@ CONFIG_MTD_PHYSMAP_BUSWIDTH=4 # # Disk-On-Chip Device Drivers # @@ -7284,7 +7284,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-it8172 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -304,11 +301,6 @@ +@@ -304,11 +301,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7296,7 +7296,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-it8172 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -592,7 +584,6 @@ +@@ -592,7 +584,6 @@ CONFIG_SERIAL_CONSOLE=y CONFIG_PC_KEYB=y # CONFIG_IT8172_SCR0 is not set # CONFIG_IT8172_SCR1 is not set @@ -7306,9 +7306,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-it8172 Index: linux-2.4.35.4/arch/mips/defconfig-ivr =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ivr 2007-12-15 05:19:43.302888729 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-ivr 2007-12-15 05:19:44.838976267 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-ivr ++++ linux-2.4.35.4/arch/mips/defconfig-ivr +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7318,7 +7318,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ivr # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -226,11 +226,6 @@ +@@ -226,11 +226,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7330,7 +7330,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ivr # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -516,7 +511,6 @@ +@@ -516,7 +511,6 @@ CONFIG_SERIAL_CONSOLE=y CONFIG_QTRONIX_KEYBOARD=y CONFIG_IT8172_CIR=y # CONFIG_IT8172_SCR0 is not set @@ -7340,9 +7340,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ivr Index: linux-2.4.35.4/arch/mips/defconfig-jmr3927 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-jmr3927 2007-12-15 05:19:43.310889184 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-jmr3927 2007-12-15 05:19:44.838976267 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-jmr3927 ++++ linux-2.4.35.4/arch/mips/defconfig-jmr3927 +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7352,7 +7352,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-jmr3927 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -225,11 +225,6 @@ +@@ -225,11 +225,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7364,7 +7364,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-jmr3927 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -454,7 +449,6 @@ +@@ -454,7 +449,6 @@ CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_TXX9_CONSOLE is not set CONFIG_TXX927_SERIAL=y CONFIG_TXX927_SERIAL_CONSOLE=y @@ -7374,9 +7374,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-jmr3927 # Index: linux-2.4.35.4/arch/mips/defconfig-lasat =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-lasat 2007-12-15 05:19:43.318889642 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-lasat 2007-12-15 05:19:44.838976267 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-lasat ++++ linux-2.4.35.4/arch/mips/defconfig-lasat +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7386,7 +7386,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-lasat # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -198,9 +198,7 @@ +@@ -198,9 +198,7 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -7396,7 +7396,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-lasat # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -219,7 +217,6 @@ +@@ -219,7 +217,6 @@ CONFIG_MTD_LASAT=y # # Disk-On-Chip Device Drivers # @@ -7404,7 +7404,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-lasat # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -303,11 +300,6 @@ +@@ -303,11 +300,6 @@ CONFIG_INET=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7416,7 +7416,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-lasat # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -584,7 +576,6 @@ +@@ -584,7 +576,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -7426,9 +7426,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-lasat Index: linux-2.4.35.4/arch/mips/defconfig-malta =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-malta 2007-12-15 05:19:43.322889868 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-malta 2007-12-15 05:19:44.842976493 +0100 -@@ -22,16 +22,19 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-malta ++++ linux-2.4.35.4/arch/mips/defconfig-malta +@@ -22,16 +22,19 @@ CONFIG_KMOD=y # # CONFIG_ACER_PICA_61 is not set # CONFIG_MIPS_BOSPORUS is not set @@ -7449,7 +7449,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-malta # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -237,11 +240,6 @@ +@@ -237,11 +240,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7461,7 +7461,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-malta # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -273,8 +271,83 @@ +@@ -273,8 +271,83 @@ CONFIG_IP_PNP_BOOTP=y # # ATA/IDE/MFM/RLL support # @@ -7546,7 +7546,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-malta # # SCSI support -@@ -319,9 +392,11 @@ +@@ -319,9 +392,11 @@ CONFIG_SD_EXTRA_DEVS=40 # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -7558,7 +7558,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-malta # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -524,7 +599,6 @@ +@@ -524,7 +599,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -7568,9 +7568,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-malta Index: linux-2.4.35.4/arch/mips/defconfig-mirage =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-mirage 2007-12-15 05:19:43.330890324 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-mirage 2007-12-15 05:19:44.842976493 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-mirage ++++ linux-2.4.35.4/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_MIPS_PB1500 is not set @@ -7580,7 +7580,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mirage # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -209,9 +209,7 @@ +@@ -209,9 +209,7 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -7590,7 +7590,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mirage CONFIG_MTD_MIRAGE=y # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -230,7 +228,6 @@ +@@ -230,7 +228,6 @@ CONFIG_MTD_MIRAGE=y # # Disk-On-Chip Device Drivers # @@ -7598,7 +7598,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mirage # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -335,11 +332,6 @@ +@@ -335,11 +332,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7610,7 +7610,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mirage # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -560,7 +552,6 @@ +@@ -560,7 +552,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -7620,9 +7620,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mirage Index: linux-2.4.35.4/arch/mips/defconfig-mpc30x =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-mpc30x 2007-12-15 05:19:43.338890782 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-mpc30x 2007-12-15 05:19:44.842976493 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-mpc30x ++++ linux-2.4.35.4/arch/mips/defconfig-mpc30x +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7632,7 +7632,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mpc30x # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -228,11 +228,6 @@ +@@ -228,11 +228,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7644,7 +7644,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mpc30x # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -400,7 +395,6 @@ +@@ -400,7 +395,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -7654,9 +7654,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mpc30x 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 2007-12-15 05:19:43.346891237 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-mtx-1 2007-12-15 05:19:44.842976493 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-mtx-1 ++++ linux-2.4.35.4/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_MIPS_PB1500 is not set @@ -7666,7 +7666,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mtx-1 # CONFIG_MIPS_XXS1500 is not set CONFIG_MIPS_MTX1=y # CONFIG_COGENT_CSB250 is not set -@@ -193,9 +193,7 @@ +@@ -193,9 +193,7 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set CONFIG_MTD_MTX1=y @@ -7676,7 +7676,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mtx-1 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -214,7 +212,6 @@ +@@ -214,7 +212,6 @@ CONFIG_MTD_MTX1=y # # Disk-On-Chip Device Drivers # @@ -7684,7 +7684,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mtx-1 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -371,11 +368,6 @@ +@@ -371,11 +368,6 @@ CONFIG_VLAN_8021Q=m # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7696,7 +7696,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mtx-1 # CONFIG_DECNET is not set CONFIG_BRIDGE=m # CONFIG_X25 is not set -@@ -479,9 +471,11 @@ +@@ -479,9 +471,11 @@ CONFIG_SR_EXTRA_DEVS=2 # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -7708,7 +7708,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mtx-1 # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -700,7 +694,6 @@ +@@ -700,7 +694,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -7718,9 +7718,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-mtx-1 Index: linux-2.4.35.4/arch/mips/defconfig-nino =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-nino 2007-12-15 05:19:43.354891693 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-nino 2007-12-15 05:19:44.846976722 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-nino ++++ linux-2.4.35.4/arch/mips/defconfig-nino +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7730,7 +7730,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-nino # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -226,11 +226,6 @@ +@@ -226,11 +226,6 @@ CONFIG_INET=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7742,7 +7742,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-nino # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -339,7 +334,6 @@ +@@ -339,7 +334,6 @@ CONFIG_SERIAL_TX3912_CONSOLE=y # CONFIG_SERIAL_TXX9 is not set # CONFIG_SERIAL_TXX9_CONSOLE is not set # CONFIG_TXX927_SERIAL is not set @@ -7752,9 +7752,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-nino # Index: linux-2.4.35.4/arch/mips/defconfig-ocelot =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-ocelot 2007-12-15 05:19:43.358891922 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-ocelot 2007-12-15 05:19:44.846976722 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-ocelot ++++ linux-2.4.35.4/arch/mips/defconfig-ocelot +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7764,7 +7764,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ocelot # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -194,9 +194,7 @@ +@@ -194,9 +194,7 @@ CONFIG_MTD_JEDEC=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -7774,7 +7774,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ocelot # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set CONFIG_MTD_OCELOT=y -@@ -215,7 +213,6 @@ +@@ -215,7 +213,6 @@ CONFIG_MTD_OCELOT=y # # Disk-On-Chip Device Drivers # @@ -7782,7 +7782,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ocelot CONFIG_MTD_DOC2000=y # CONFIG_MTD_DOC2001 is not set CONFIG_MTD_DOCPROBE=y -@@ -307,11 +304,6 @@ +@@ -307,11 +304,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7794,7 +7794,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ocelot # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -513,7 +505,6 @@ +@@ -513,7 +505,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -7804,9 +7804,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ocelot Index: linux-2.4.35.4/arch/mips/defconfig-osprey =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-osprey 2007-12-15 05:19:43.366892377 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-osprey 2007-12-15 05:19:44.846976722 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-osprey ++++ linux-2.4.35.4/arch/mips/defconfig-osprey +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7816,7 +7816,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-osprey # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -227,11 +227,6 @@ +@@ -227,11 +227,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7828,7 +7828,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-osprey # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -388,7 +383,6 @@ +@@ -388,7 +383,6 @@ CONFIG_SERIAL_MANY_PORTS=y # CONFIG_SERIAL_MULTIPORT is not set # CONFIG_HUB6 is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -7838,9 +7838,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-osprey 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 2007-12-15 05:19:43.374892832 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-pb1000 2007-12-15 05:19:44.846976722 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-pb1000 ++++ linux-2.4.35.4/arch/mips/defconfig-pb1000 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y CONFIG_MIPS_PB1000=y # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -7850,7 +7850,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1000 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -215,9 +215,7 @@ +@@ -215,9 +215,7 @@ CONFIG_MTD_PB1000=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -7860,7 +7860,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1000 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -236,7 +234,6 @@ +@@ -236,7 +234,6 @@ CONFIG_MTD_PB1000=y # # Disk-On-Chip Device Drivers # @@ -7868,7 +7868,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1000 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -324,11 +321,6 @@ +@@ -324,11 +321,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7880,7 +7880,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1000 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -622,7 +614,6 @@ +@@ -622,7 +614,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -7888,7 +7888,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1000 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -@@ -707,7 +698,7 @@ +@@ -707,7 +698,7 @@ CONFIG_UNIX98_PTY_COUNT=256 # # CONFIG_PCMCIA_SERIAL_CS is not set # CONFIG_SYNCLINK_CS is not set @@ -7899,9 +7899,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1000 # Index: linux-2.4.35.4/arch/mips/defconfig-pb1100 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-pb1100 2007-12-15 05:19:43.382893288 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-pb1100 2007-12-15 05:19:44.850976948 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-pb1100 ++++ linux-2.4.35.4/arch/mips/defconfig-pb1100 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set CONFIG_MIPS_PB1100=y # CONFIG_MIPS_PB1500 is not set @@ -7911,7 +7911,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1100 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -198,9 +198,7 @@ +@@ -198,9 +198,7 @@ CONFIG_MTD_PB1100=y # CONFIG_MTD_MTX1 is not set CONFIG_MTD_PB1500_BOOT=y CONFIG_MTD_PB1500_USER=y @@ -7921,7 +7921,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1100 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -219,7 +217,6 @@ +@@ -219,7 +217,6 @@ CONFIG_MTD_PB1500_USER=y # # Disk-On-Chip Device Drivers # @@ -7929,7 +7929,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1100 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -324,11 +321,6 @@ +@@ -324,11 +321,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -7941,7 +7941,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1100 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -613,7 +605,6 @@ +@@ -613,7 +605,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -7949,7 +7949,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1100 CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -@@ -859,6 +850,7 @@ +@@ -859,6 +850,7 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_FB_PM2 is not set # CONFIG_FB_PM3 is not set # CONFIG_FB_CYBER2000 is not set @@ -7957,7 +7957,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1100 # CONFIG_FB_MATROX is not set # CONFIG_FB_ATY is not set # CONFIG_FB_RADEON is not set -@@ -870,7 +862,6 @@ +@@ -870,7 +862,6 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_E1356 is not set @@ -7967,8 +7967,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1100 CONFIG_FBCON_ADVANCED=y Index: linux-2.4.35.4/arch/mips/defconfig-pb1200 =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/defconfig-pb1200 2007-12-15 05:19:44.850976948 +0100 +--- /dev/null ++++ linux-2.4.35.4/arch/mips/defconfig-pb1200 @@ -0,0 +1,1060 @@ +# +# Automatically generated make config: don't edit @@ -9032,9 +9032,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1200 +# 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 2007-12-15 05:19:43.394893972 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-pb1500 2007-12-15 05:19:44.850976948 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-pb1500 ++++ linux-2.4.35.4/arch/mips/defconfig-pb1500 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set CONFIG_MIPS_PB1500=y @@ -9044,7 +9044,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1500 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -215,9 +215,7 @@ +@@ -215,9 +215,7 @@ CONFIG_MTD_PB1500=y # CONFIG_MTD_MTX1 is not set CONFIG_MTD_PB1500_BOOT=y # CONFIG_MTD_PB1500_USER is not set @@ -9054,7 +9054,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1500 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -236,7 +234,6 @@ +@@ -236,7 +234,6 @@ CONFIG_MTD_PB1500_BOOT=y # # Disk-On-Chip Device Drivers # @@ -9062,7 +9062,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1500 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -341,11 +338,6 @@ +@@ -341,11 +338,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9074,7 +9074,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1500 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -675,7 +667,6 @@ +@@ -675,7 +667,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -9084,9 +9084,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1500 Index: linux-2.4.35.4/arch/mips/defconfig-pb1550 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-pb1550 2007-12-15 05:19:43.402894428 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-pb1550 2007-12-15 05:19:44.854977177 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-pb1550 ++++ linux-2.4.35.4/arch/mips/defconfig-pb1550 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9096,7 +9096,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1550 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -213,11 +213,9 @@ +@@ -213,11 +213,9 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set # CONFIG_MTD_XXS1500 is not set # CONFIG_MTD_MTX1 is not set @@ -9108,7 +9108,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1550 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -236,7 +234,6 @@ +@@ -236,7 +234,6 @@ CONFIG_MTD_PB1550_USER=y # # Disk-On-Chip Device Drivers # @@ -9116,7 +9116,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1550 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -343,11 +340,6 @@ +@@ -343,11 +340,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9128,7 +9128,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1550 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -633,7 +625,6 @@ +@@ -633,7 +625,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -9138,9 +9138,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-pb1550 Index: linux-2.4.35.4/arch/mips/defconfig-rbtx4927 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-rbtx4927 2007-12-15 05:19:43.406894657 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-rbtx4927 2007-12-15 05:19:44.854977177 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-rbtx4927 ++++ linux-2.4.35.4/arch/mips/defconfig-rbtx4927 +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9150,7 +9150,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-rbtx4927 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -223,11 +223,6 @@ +@@ -223,11 +223,6 @@ CONFIG_IP_PNP_DHCP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9162,7 +9162,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-rbtx4927 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -466,7 +461,6 @@ +@@ -466,7 +461,6 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_SERIAL_TXX9=y CONFIG_SERIAL_TXX9_CONSOLE=y # CONFIG_TXX927_SERIAL is not set @@ -9172,9 +9172,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-rbtx4927 # Index: linux-2.4.35.4/arch/mips/defconfig-rm200 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-rm200 2007-12-15 05:19:43.414895112 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-rm200 2007-12-15 05:19:44.854977177 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-rm200 ++++ linux-2.4.35.4/arch/mips/defconfig-rm200 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9184,7 +9184,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-rm200 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -229,11 +229,6 @@ +@@ -229,11 +229,6 @@ CONFIG_INET=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9196,7 +9196,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-rm200 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -340,7 +335,6 @@ +@@ -340,7 +335,6 @@ CONFIG_VT_CONSOLE=y # CONFIG_SERIAL is not set # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -9206,9 +9206,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-rm200 Index: linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-sb1250-swarm 2007-12-15 05:19:43.422895567 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm 2007-12-15 05:19:44.854977177 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-sb1250-swarm ++++ linux-2.4.35.4/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_MIPS_PB1500 is not set @@ -9218,7 +9218,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -90,6 +90,7 @@ +@@ -90,6 +90,7 @@ CONFIG_SIBYTE_CFE=y # CONFIG_SIBYTE_TBPROF is not set CONFIG_SIBYTE_GENBUS_IDE=y CONFIG_SMP_CAPABLE=y @@ -9226,7 +9226,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm # CONFIG_SNI_RM200_PCI is not set # CONFIG_TANBAC_TB0226 is not set # CONFIG_TANBAC_TB0229 is not set -@@ -253,11 +254,6 @@ +@@ -253,11 +254,6 @@ CONFIG_INET=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9238,7 +9238,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -469,7 +465,6 @@ +@@ -469,7 +465,6 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_SIBYTE_SB1250_DUART=y CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y CONFIG_SERIAL_CONSOLE=y @@ -9248,9 +9248,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-sb1250-swarm Index: linux-2.4.35.4/arch/mips/defconfig-sead =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-sead 2007-12-15 05:19:43.430896023 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-sead 2007-12-15 05:19:44.854977177 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-sead ++++ linux-2.4.35.4/arch/mips/defconfig-sead +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9260,7 +9260,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-sead # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -244,7 +244,6 @@ +@@ -244,7 +244,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -9270,9 +9270,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-sead # Index: linux-2.4.35.4/arch/mips/defconfig-stretch =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-stretch 2007-12-15 05:19:43.438896481 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-stretch 2007-12-15 05:19:44.858977407 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-stretch ++++ linux-2.4.35.4/arch/mips/defconfig-stretch +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9282,7 +9282,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-stretch # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -240,11 +240,6 @@ +@@ -240,11 +240,6 @@ CONFIG_IP_PNP_DHCP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9294,7 +9294,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-stretch # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -324,9 +319,11 @@ +@@ -324,9 +319,11 @@ CONFIG_CHR_DEV_SG=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -9306,7 +9306,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-stretch # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -516,7 +513,6 @@ +@@ -516,7 +513,6 @@ CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_TXX9 is not set # CONFIG_SERIAL_TXX9_CONSOLE is not set # CONFIG_TXX927_SERIAL is not set @@ -9316,9 +9316,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-stretch Index: linux-2.4.35.4/arch/mips/defconfig-tb0226 =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-tb0226 2007-12-15 05:19:43.442896707 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-tb0226 2007-12-15 05:19:44.858977407 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-tb0226 ++++ linux-2.4.35.4/arch/mips/defconfig-tb0226 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9328,7 +9328,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-tb0226 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -228,11 +228,6 @@ +@@ -228,11 +228,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9340,7 +9340,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-tb0226 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -312,9 +307,11 @@ +@@ -312,9 +307,11 @@ CONFIG_SCSI_CONSTANTS=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -9352,7 +9352,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-tb0226 # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -518,7 +515,6 @@ +@@ -518,7 +515,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -9362,9 +9362,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-tb0226 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 2007-12-15 05:19:43.450897163 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-tb0229 2007-12-15 05:19:44.858977407 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-tb0229 ++++ linux-2.4.35.4/arch/mips/defconfig-tb0229 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9374,7 +9374,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-tb0229 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -230,11 +230,6 @@ +@@ -230,11 +230,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9386,7 +9386,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-tb0229 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -445,7 +440,6 @@ +@@ -445,7 +440,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -9396,9 +9396,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-tb0229 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 2007-12-15 05:19:43.458897621 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-ti1500 2007-12-15 05:19:44.858977407 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-ti1500 ++++ linux-2.4.35.4/arch/mips/defconfig-ti1500 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9408,7 +9408,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ti1500 CONFIG_MIPS_XXS1500=y # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -213,9 +213,7 @@ +@@ -213,9 +213,7 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set CONFIG_MTD_XXS1500=y # CONFIG_MTD_MTX1 is not set @@ -9418,7 +9418,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ti1500 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -234,7 +232,6 @@ +@@ -234,7 +232,6 @@ CONFIG_MTD_XXS1500=y # # Disk-On-Chip Device Drivers # @@ -9426,7 +9426,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ti1500 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -339,11 +336,6 @@ +@@ -339,11 +336,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9438,7 +9438,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ti1500 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -600,7 +592,6 @@ +@@ -600,7 +592,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -9448,9 +9448,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-ti1500 Index: linux-2.4.35.4/arch/mips/defconfig-workpad =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-workpad 2007-12-15 05:19:43.466898076 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-workpad 2007-12-15 05:19:44.862977633 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-workpad ++++ linux-2.4.35.4/arch/mips/defconfig-workpad +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9460,7 +9460,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-workpad # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -222,11 +222,6 @@ +@@ -222,11 +222,6 @@ CONFIG_IP_MULTICAST=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9472,7 +9472,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-workpad # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -426,7 +421,6 @@ +@@ -426,7 +421,6 @@ CONFIG_SERIAL_MANY_PORTS=y # CONFIG_SERIAL_MULTIPORT is not set # CONFIG_HUB6 is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -9482,9 +9482,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-workpad 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 2007-12-15 05:19:43.474898531 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-xxs1500 2007-12-15 05:19:44.862977633 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-xxs1500 ++++ linux-2.4.35.4/arch/mips/defconfig-xxs1500 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9494,7 +9494,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-xxs1500 CONFIG_MIPS_XXS1500=y # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -213,9 +213,7 @@ +@@ -213,9 +213,7 @@ CONFIG_MTD_CFI_AMDSTD=y # CONFIG_MTD_BOSPORUS is not set CONFIG_MTD_XXS1500=y # CONFIG_MTD_MTX1 is not set @@ -9504,7 +9504,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-xxs1500 # CONFIG_MTD_MIRAGE is not set # CONFIG_MTD_CSTM_MIPS_IXX is not set # CONFIG_MTD_OCELOT is not set -@@ -234,7 +232,6 @@ +@@ -234,7 +232,6 @@ CONFIG_MTD_XXS1500=y # # Disk-On-Chip Device Drivers # @@ -9512,7 +9512,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-xxs1500 # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOCPROBE is not set -@@ -339,11 +336,6 @@ +@@ -339,11 +336,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9524,7 +9524,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-xxs1500 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -671,7 +663,6 @@ +@@ -671,7 +663,6 @@ CONFIG_AU1X00_SERIAL_CONSOLE=y # CONFIG_AU1X00_USB_TTY is not set # CONFIG_AU1X00_USB_RAW is not set # CONFIG_TXX927_SERIAL is not set @@ -9534,9 +9534,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-xxs1500 Index: linux-2.4.35.4/arch/mips/defconfig-yosemite =================================================================== ---- linux-2.4.35.4.orig/arch/mips/defconfig-yosemite 2007-12-15 05:19:43.478898761 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig-yosemite 2007-12-15 05:19:44.862977633 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig-yosemite ++++ linux-2.4.35.4/arch/mips/defconfig-yosemite +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -9546,7 +9546,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-yosemite # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -227,11 +227,6 @@ +@@ -227,11 +227,6 @@ CONFIG_IP_PNP_DHCP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -9558,7 +9558,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-yosemite # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -310,9 +305,11 @@ +@@ -310,9 +305,11 @@ CONFIG_CHR_DEV_SG=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -9570,7 +9570,7 @@ Index: linux-2.4.35.4/arch/mips/defconfig-yosemite # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -477,7 +474,6 @@ +@@ -477,7 +474,6 @@ CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_TXX9 is not set # CONFIG_SERIAL_TXX9_CONSOLE is not set # CONFIG_TXX927_SERIAL is not set @@ -9580,9 +9580,9 @@ Index: linux-2.4.35.4/arch/mips/defconfig-yosemite Index: linux-2.4.35.4/arch/mips/kernel/cpu-probe.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/cpu-probe.c 2007-12-15 05:19:43.486899216 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/cpu-probe.c 2007-12-15 05:19:44.862977633 +0100 -@@ -34,21 +34,16 @@ +--- linux-2.4.35.4.orig/arch/mips/kernel/cpu-probe.c ++++ linux-2.4.35.4/arch/mips/kernel/cpu-probe.c +@@ -34,21 +34,16 @@ static void r4k_wait(void) ".set\tmips0"); } @@ -9612,7 +9612,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/cpu-probe.c "sync\n\t" "nop\n\t" "wait\n\t" -@@ -57,11 +52,7 @@ +@@ -57,11 +52,7 @@ void au1k_wait(void) "nop\n\t" "nop\n\t" ".set mips0\n\t" @@ -9625,7 +9625,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/cpu-probe.c } static inline void check_wait(void) -@@ -100,20 +91,17 @@ +@@ -100,20 +91,17 @@ static inline void check_wait(void) cpu_wait = r4k_wait; printk(" available.\n"); break; @@ -9652,8 +9652,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/cpu-probe.c break; Index: linux-2.4.35.4/arch/mips/kernel/head.S =================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/head.S 2007-12-15 05:19:43.494899671 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/head.S 2007-12-15 05:19:44.866977862 +0100 +--- linux-2.4.35.4.orig/arch/mips/kernel/head.S ++++ linux-2.4.35.4/arch/mips/kernel/head.S @@ -43,9 +43,9 @@ /* Cache Error */ @@ -9709,7 +9709,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/head.S .set noat .set noreorder mtc0 k0, CP0_DESAVE -@@ -120,7 +126,7 @@ +@@ -120,7 +126,7 @@ ejtag_return: deret .set mips0 nop @@ -9718,7 +9718,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/head.S END(ejtag_debug_handler) __INIT -@@ -132,13 +138,17 @@ +@@ -132,13 +138,17 @@ ejtag_return: * unconditional jump to this vector. */ NESTED(except_vec_nmi, 0, sp) @@ -9736,7 +9736,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/head.S .set noat .set noreorder .set mips3 -@@ -147,8 +157,7 @@ +@@ -147,8 +157,7 @@ ejtag_return: move a0, sp RESTORE_ALL eret @@ -9746,7 +9746,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/head.S END(nmi_handler) __INIT -@@ -157,7 +166,20 @@ +@@ -157,7 +166,20 @@ ejtag_return: * Kernel entry point */ NESTED(kernel_entry, 16, sp) @@ -9767,7 +9767,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/head.S /* * The firmware/bootloader passes argc/argp/envp -@@ -170,8 +192,8 @@ +@@ -170,8 +192,8 @@ ejtag_return: la t1, (_end - 4) 1: addiu t0, 4 @@ -9777,7 +9777,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/head.S /* * Stack for kernel and init, current variable -@@ -182,7 +204,7 @@ +@@ -182,7 +204,7 @@ ejtag_return: sw t0, kernelsp jal init_arch @@ -9786,7 +9786,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/head.S END(kernel_entry) -@@ -193,17 +215,26 @@ +@@ -193,17 +215,26 @@ ejtag_return: * function after setting up the stack and gp registers. */ LEAF(smp_bootstrap) @@ -9824,9 +9824,9 @@ Index: linux-2.4.35.4/arch/mips/kernel/head.S Index: linux-2.4.35.4/arch/mips/kernel/process.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/process.c 2007-12-15 05:19:43.502900127 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/process.c 2007-12-15 05:19:44.866977862 +0100 -@@ -128,6 +128,26 @@ +--- linux-2.4.35.4.orig/arch/mips/kernel/process.c ++++ linux-2.4.35.4/arch/mips/kernel/process.c +@@ -128,6 +128,26 @@ int dump_fpu(struct pt_regs *regs, elf_f return 1; } @@ -9855,9 +9855,9 @@ Index: linux-2.4.35.4/arch/mips/kernel/process.c */ Index: linux-2.4.35.4/arch/mips/kernel/scall_o32.S =================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/scall_o32.S 2007-12-15 05:19:43.506900356 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/scall_o32.S 2007-12-15 05:19:44.866977862 +0100 -@@ -121,15 +121,14 @@ +--- linux-2.4.35.4.orig/arch/mips/kernel/scall_o32.S ++++ linux-2.4.35.4/arch/mips/kernel/scall_o32.S +@@ -121,15 +121,14 @@ reschedule: trace_a_syscall: SAVE_STATIC @@ -9877,8 +9877,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/scall_o32.S 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 2007-12-15 05:19:43.514900811 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/setup.c 2007-12-15 05:19:44.866977862 +0100 +--- linux-2.4.35.4.orig/arch/mips/kernel/setup.c ++++ linux-2.4.35.4/arch/mips/kernel/setup.c @@ -5,7 +5,7 @@ * * Copyright (C) 1995 Linus Torvalds @@ -9888,7 +9888,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/setup.c * Copyright (C) 1996 Stoned Elipot * Copyright (C) 2000, 2001, 2002 Maciej W. Rozycki */ -@@ -71,6 +71,8 @@ +@@ -71,6 +71,8 @@ extern void * __rd_start, * __rd_end; extern struct rtc_ops no_rtc_ops; struct rtc_ops *rtc_ops; @@ -9897,7 +9897,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/setup.c #ifdef CONFIG_PC_KEYB struct kbd_ops *kbd_ops; #endif -@@ -132,10 +134,6 @@ +@@ -132,10 +134,6 @@ init_arch(int argc, char **argv, char ** */ load_mmu(); @@ -9910,9 +9910,9 @@ Index: linux-2.4.35.4/arch/mips/kernel/setup.c Index: linux-2.4.35.4/arch/mips/kernel/traps.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/traps.c 2007-12-15 05:19:43.522901266 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/traps.c 2007-12-15 05:19:44.870978088 +0100 -@@ -452,9 +452,10 @@ +--- linux-2.4.35.4.orig/arch/mips/kernel/traps.c ++++ linux-2.4.35.4/arch/mips/kernel/traps.c +@@ -452,9 +452,10 @@ static inline void simulate_ll(struct pt } ll_task = current; @@ -9924,7 +9924,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/traps.c return; sig: -@@ -485,8 +486,8 @@ +@@ -485,8 +486,8 @@ static inline void simulate_sc(struct pt goto sig; } if (ll_bit == 0 || ll_task != current) { @@ -9934,7 +9934,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/traps.c return; } -@@ -495,9 +496,9 @@ +@@ -495,9 +496,9 @@ static inline void simulate_sc(struct pt goto sig; } @@ -9945,7 +9945,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/traps.c return; sig: -@@ -887,12 +888,18 @@ +@@ -887,12 +888,18 @@ extern asmlinkage int fpu_emulator_resto void __init per_cpu_trap_init(void) { unsigned int cpu = smp_processor_id(); @@ -9968,7 +9968,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/traps.c /* * Some MIPS CPUs have a dedicated interrupt vector which reduces the -@@ -902,7 +909,7 @@ +@@ -902,7 +909,7 @@ void __init per_cpu_trap_init(void) set_c0_cause(CAUSEF_IV); cpu_data[cpu].asid_cache = ASID_FIRST_VERSION; @@ -9977,7 +9977,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/traps.c atomic_inc(&init_mm.mm_count); current->active_mm = &init_mm; -@@ -918,8 +925,6 @@ +@@ -918,8 +925,6 @@ void __init trap_init(void) extern char except_vec4; unsigned long i; @@ -9986,7 +9986,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/traps.c /* Copy the generic exception handler code to it's final destination. */ memcpy((void *)(KSEG0 + 0x80), &except_vec1_generic, 0x80); -@@ -1020,10 +1025,5 @@ +@@ -1020,10 +1025,5 @@ void __init trap_init(void) flush_icache_range(KSEG0, KSEG0 + 0x400); @@ -10000,8 +10000,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/traps.c } Index: linux-2.4.35.4/arch/mips/lib/rtc-no.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/lib/rtc-no.c 2007-12-15 05:19:43.530901722 +0100 -+++ linux-2.4.35.4/arch/mips/lib/rtc-no.c 2007-12-15 05:19:44.870978088 +0100 +--- linux-2.4.35.4.orig/arch/mips/lib/rtc-no.c ++++ linux-2.4.35.4/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. @@ -10014,7 +10014,7 @@ Index: linux-2.4.35.4/arch/mips/lib/rtc-no.c #include <linux/mc146818rtc.h> static unsigned int shouldnt_happen(void) -@@ -29,5 +28,3 @@ +@@ -29,5 +28,3 @@ struct rtc_ops no_rtc_ops = { .rtc_write_data = (void *) &shouldnt_happen, .rtc_bcd_mode = (void *) &shouldnt_happen }; @@ -10022,8 +10022,8 @@ Index: linux-2.4.35.4/arch/mips/lib/rtc-no.c -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 2007-12-15 05:19:43.538902180 +0100 -+++ linux-2.4.35.4/arch/mips/lib/rtc-std.c 2007-12-15 05:19:44.870978088 +0100 +--- linux-2.4.35.4.orig/arch/mips/lib/rtc-std.c ++++ linux-2.4.35.4/arch/mips/lib/rtc-std.c @@ -5,9 +5,8 @@ * * RTC routines for PC style attached Dallas chip. @@ -10035,7 +10035,7 @@ Index: linux-2.4.35.4/arch/mips/lib/rtc-std.c #include <linux/mc146818rtc.h> #include <asm/io.h> -@@ -33,5 +32,3 @@ +@@ -33,5 +32,3 @@ struct rtc_ops std_rtc_ops = { &std_rtc_write_data, &std_rtc_bcd_mode }; @@ -10043,9 +10043,9 @@ Index: linux-2.4.35.4/arch/mips/lib/rtc-std.c -EXPORT_SYMBOL(rtc_ops); Index: linux-2.4.35.4/arch/mips/Makefile =================================================================== ---- linux-2.4.35.4.orig/arch/mips/Makefile 2007-12-15 05:19:43.546902635 +0100 -+++ linux-2.4.35.4/arch/mips/Makefile 2007-12-15 05:19:44.870978088 +0100 -@@ -209,7 +209,7 @@ +--- linux-2.4.35.4.orig/arch/mips/Makefile ++++ linux-2.4.35.4/arch/mips/Makefile +@@ -209,7 +209,7 @@ LOADADDR := 0x80080000 endif # @@ -10054,7 +10054,7 @@ Index: linux-2.4.35.4/arch/mips/Makefile # ifdef CONFIG_MIPS_PB1000 LIBS += arch/mips/au1000/pb1000/pb1000.o \ -@@ -218,9 +218,6 @@ +@@ -218,9 +218,6 @@ SUBDIRS += arch/mips/au1000/pb1000 arch LOADADDR := 0x80100000 endif @@ -10064,7 +10064,7 @@ Index: linux-2.4.35.4/arch/mips/Makefile ifdef CONFIG_MIPS_PB1100 LIBS += arch/mips/au1000/pb1100/pb1100.o \ arch/mips/au1000/common/au1000.o -@@ -228,9 +225,6 @@ +@@ -228,9 +225,6 @@ SUBDIRS += arch/mips/au1000/pb1100 LOADADDR += 0x80100000 endif @@ -10074,7 +10074,7 @@ Index: linux-2.4.35.4/arch/mips/Makefile ifdef CONFIG_MIPS_PB1500 LIBS += arch/mips/au1000/pb1500/pb1500.o \ arch/mips/au1000/common/au1000.o -@@ -238,9 +232,6 @@ +@@ -238,9 +232,6 @@ SUBDIRS += arch/mips/au1000/pb1500 arch LOADADDR := 0x80100000 endif @@ -10084,7 +10084,7 @@ Index: linux-2.4.35.4/arch/mips/Makefile ifdef CONFIG_MIPS_DB1000 LIBS += arch/mips/au1000/db1x00/db1x00.o \ arch/mips/au1000/common/au1000.o -@@ -311,6 +302,27 @@ +@@ -311,6 +302,27 @@ SUBDIRS += arch/mips/au1000/pb1550 LOADADDR += 0x80100000 endif @@ -10114,9 +10114,9 @@ Index: linux-2.4.35.4/arch/mips/Makefile # 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 2007-12-15 05:19:43.554903091 +0100 -+++ linux-2.4.35.4/arch/mips/mm/cerr-sb1.c 2007-12-15 05:19:44.870978088 +0100 -@@ -252,14 +252,14 @@ +--- linux-2.4.35.4.orig/arch/mips/mm/cerr-sb1.c ++++ linux-2.4.35.4/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] */ static const uint64_t mask_72_64[8] = { @@ -10139,7 +10139,7 @@ Index: linux-2.4.35.4/arch/mips/mm/cerr-sb1.c }; /* Calculate the parity on a range of bits */ -@@ -331,9 +331,9 @@ +@@ -331,9 +331,9 @@ static uint32_t extract_ic(unsigned shor ((lru >> 4) & 0x3), ((lru >> 6) & 0x3)); } @@ -10151,7 +10151,7 @@ Index: linux-2.4.35.4/arch/mips/mm/cerr-sb1.c valid = ((taghi >> 29) & 1); if (valid) { tlo_tmp = taglo & 0xfff3ff; -@@ -474,7 +474,7 @@ +@@ -474,7 +474,7 @@ static uint32_t extract_dc(unsigned shor : "r" ((way << 13) | addr)); taglo = ((unsigned long long)taglohi << 32) | taglolo; @@ -10162,9 +10162,9 @@ Index: linux-2.4.35.4/arch/mips/mm/cerr-sb1.c 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 2007-12-15 05:19:43.558903320 +0100 -+++ linux-2.4.35.4/arch/mips/mm/c-r4k.c 2007-12-15 05:19:44.874978317 +0100 -@@ -867,9 +867,16 @@ +--- linux-2.4.35.4.orig/arch/mips/mm/c-r4k.c ++++ linux-2.4.35.4/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. */ @@ -10184,7 +10184,7 @@ Index: linux-2.4.35.4/arch/mips/mm/c-r4k.c switch (c->cputype) { case CPU_20KC: -@@ -1069,9 +1076,6 @@ +@@ -1069,9 +1076,6 @@ void __init ld_mmu_r4xx0(void) probe_pcache(); setup_scache(); @@ -10196,8 +10196,8 @@ Index: linux-2.4.35.4/arch/mips/mm/c-r4k.c 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 2007-12-15 05:19:43.566903775 +0100 -+++ linux-2.4.35.4/arch/mips/mm/tlbex-mips32.S 2007-12-15 05:19:44.874978317 +0100 +--- linux-2.4.35.4.orig/arch/mips/mm/tlbex-mips32.S ++++ linux-2.4.35.4/arch/mips/mm/tlbex-mips32.S @@ -196,7 +196,7 @@ .set noat; \ SAVE_ALL; \ @@ -10209,8 +10209,8 @@ Index: linux-2.4.35.4/arch/mips/mm/tlbex-mips32.S 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 2007-12-15 05:19:43.574904230 +0100 -+++ linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S 2007-12-15 05:19:44.874978317 +0100 +--- linux-2.4.35.4.orig/arch/mips/mm/tlbex-r4k.S ++++ linux-2.4.35.4/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 @@ -10228,7 +10228,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S END(except_vec0_r4000) /* TLB refill, EXL == 0, R4600 version */ -@@ -468,13 +465,9 @@ +@@ -468,13 +465,9 @@ invalid_tlbl: PTE_PRESENT(k0, k1, nopage_tlbl) PTE_MAKEVALID(k0, k1) PTE_RELOAD(k1, k0) @@ -10245,7 +10245,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S .set mips3 eret .set mips0 -@@ -496,13 +489,9 @@ +@@ -496,13 +489,9 @@ nopage_tlbl: PTE_WRITABLE(k0, k1, nopage_tlbs) PTE_MAKEWRITE(k0, k1) PTE_RELOAD(k1, k0) @@ -10262,7 +10262,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S .set mips3 eret .set mips0 -@@ -529,13 +518,9 @@ +@@ -529,13 +518,9 @@ nopage_tlbs: /* Now reload the entry into the tlb. */ PTE_RELOAD(k1, k0) @@ -10281,8 +10281,8 @@ Index: linux-2.4.35.4/arch/mips/mm/tlbex-r4k.S .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 2007-12-15 05:19:43.582904686 +0100 -+++ linux-2.4.35.4/arch/mips/mm/tlb-r4k.c 2007-12-15 05:19:44.874978317 +0100 +--- linux-2.4.35.4.orig/arch/mips/mm/tlb-r4k.c ++++ linux-2.4.35.4/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. @@ -10314,7 +10314,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c extern char except_vec0_nevada, except_vec0_r4000, except_vec0_r4600; /* CP0 hazard avoidance. */ -@@ -41,33 +33,23 @@ +@@ -41,33 +33,23 @@ void local_flush_tlb_all(void) unsigned long old_ctx; int entry; @@ -10350,7 +10350,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c write_c0_entryhi(old_ctx); local_irq_restore(flags); } -@@ -76,12 +58,8 @@ +@@ -76,12 +58,8 @@ void local_flush_tlb_mm(struct mm_struct { int cpu = smp_processor_id(); @@ -10364,7 +10364,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c } void local_flush_tlb_range(struct mm_struct *mm, unsigned long start, -@@ -93,10 +71,6 @@ +@@ -93,10 +71,6 @@ void local_flush_tlb_range(struct mm_str unsigned long flags; int size; @@ -10375,7 +10375,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c local_irq_save(flags); size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT; size = (size + 1) >> 1; -@@ -112,7 +86,7 @@ +@@ -112,7 +86,7 @@ void local_flush_tlb_range(struct mm_str write_c0_entryhi(start | newpid); start += (PAGE_SIZE << 1); @@ -10384,7 +10384,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c tlb_probe(); BARRIER; idx = read_c0_index(); -@@ -122,10 +96,10 @@ +@@ -122,10 +96,10 @@ void local_flush_tlb_range(struct mm_str continue; /* Make sure all entries differ. */ write_c0_entryhi(KSEG0 + idx*0x2000); @@ -10397,7 +10397,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c write_c0_entryhi(oldpid); } else { drop_mmu_context(mm, cpu); -@@ -138,34 +112,30 @@ +@@ -138,34 +112,30 @@ void local_flush_tlb_page(struct vm_area { int cpu = smp_processor_id(); @@ -10438,7 +10438,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c write_c0_entryhi(oldpid); local_irq_restore(flags); } -@@ -185,7 +155,7 @@ +@@ -185,7 +155,7 @@ void local_flush_tlb_one(unsigned long p local_irq_save(flags); write_c0_entryhi(page); @@ -10447,7 +10447,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c tlb_probe(); BARRIER; idx = read_c0_index(); -@@ -194,18 +164,19 @@ +@@ -194,18 +164,19 @@ void local_flush_tlb_one(unsigned long p if (idx >= 0) { /* Make sure all entries differ. */ write_c0_entryhi(KSEG0+idx*0x2000); @@ -10471,7 +10471,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c */ void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte) { -@@ -223,25 +194,16 @@ +@@ -223,25 +194,16 @@ void __update_tlb(struct vm_area_struct pid = read_c0_entryhi() & ASID_MASK; @@ -10498,7 +10498,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c #if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32) write_c0_entrylo0(ptep->pte_high); ptep++; -@@ -251,15 +213,13 @@ +@@ -251,15 +213,13 @@ void __update_tlb(struct vm_area_struct write_c0_entrylo1(pte_val(*ptep) >> 6); #endif write_c0_entryhi(address | pid); @@ -10518,7 +10518,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c local_irq_restore(flags); } -@@ -279,24 +239,26 @@ +@@ -279,24 +239,26 @@ static void r4k_update_mmu_cache_hwbug(s asid = read_c0_entryhi() & ASID_MASK; write_c0_entryhi(address | asid); pgdp = pgd_offset(vma->vm_mm, address); @@ -10548,7 +10548,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c { unsigned long flags; unsigned long wired; -@@ -315,9 +277,9 @@ +@@ -315,9 +277,9 @@ void __init add_wired_entry(unsigned lon write_c0_entryhi(entryhi); write_c0_entrylo0(entrylo0); write_c0_entrylo1(entrylo1); @@ -10560,7 +10560,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c write_c0_entryhi(old_ctx); BARRIER; -@@ -355,17 +317,15 @@ +@@ -355,17 +317,15 @@ __init int add_temporary_entry(unsigned } write_c0_index(temp_tlb_entry); @@ -10580,7 +10580,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c write_c0_pagemask(old_pagemask); out: local_irq_restore(flags); -@@ -375,7 +335,7 @@ +@@ -375,7 +335,7 @@ out: static void __init probe_tlb(unsigned long config) { struct cpuinfo_mips *c = ¤t_cpu_data; @@ -10589,7 +10589,7 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c /* * If this isn't a MIPS32 / MIPS64 compliant CPU. Config 1 register -@@ -385,16 +345,16 @@ +@@ -385,16 +345,16 @@ static void __init probe_tlb(unsigned lo if ((c->processor_id & 0xff0000) == PRID_COMP_LEGACY) return; @@ -10611,9 +10611,9 @@ Index: linux-2.4.35.4/arch/mips/mm/tlb-r4k.c * You should never change this register: Index: linux-2.4.35.4/arch/mips64/defconfig =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig 2007-12-15 05:19:43.590905141 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig 2007-12-15 05:19:44.874978317 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig ++++ linux-2.4.35.4/arch/mips64/defconfig +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -10623,7 +10623,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -470,9 +470,11 @@ +@@ -470,9 +470,11 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -10635,7 +10635,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -658,7 +660,6 @@ +@@ -658,7 +660,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -10645,9 +10645,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig Index: linux-2.4.35.4/arch/mips64/defconfig-atlas =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-atlas 2007-12-15 05:19:43.598905599 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig-atlas 2007-12-15 05:19:44.878978546 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig-atlas ++++ linux-2.4.35.4/arch/mips64/defconfig-atlas +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -10657,7 +10657,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-atlas # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -232,11 +232,6 @@ +@@ -232,11 +232,6 @@ CONFIG_IP_PNP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -10669,7 +10669,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-atlas # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -314,9 +309,11 @@ +@@ -314,9 +309,11 @@ CONFIG_SD_EXTRA_DEVS=40 # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -10681,7 +10681,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-atlas # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -474,7 +471,6 @@ +@@ -474,7 +471,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -10691,9 +10691,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-atlas Index: linux-2.4.35.4/arch/mips64/defconfig-decstation =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-decstation 2007-12-15 05:19:43.606906055 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig-decstation 2007-12-15 05:19:44.878978546 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig-decstation ++++ linux-2.4.35.4/arch/mips64/defconfig-decstation +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -10703,7 +10703,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-decstation # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -224,11 +224,6 @@ +@@ -224,11 +224,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -10715,7 +10715,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-decstation # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -307,9 +302,11 @@ +@@ -307,9 +302,11 @@ CONFIG_SCSI_DECNCR=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -10727,7 +10727,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-decstation # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -477,7 +474,6 @@ +@@ -477,7 +474,6 @@ CONFIG_SERIAL_DEC=y CONFIG_SERIAL_DEC_CONSOLE=y # CONFIG_DZ is not set CONFIG_ZS=y @@ -10737,9 +10737,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-decstation Index: linux-2.4.35.4/arch/mips64/defconfig-ip22 =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-ip22 2007-12-15 05:19:43.610906281 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig-ip22 2007-12-15 05:19:44.878978546 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig-ip22 ++++ linux-2.4.35.4/arch/mips64/defconfig-ip22 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -10749,7 +10749,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ip22 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -235,11 +235,6 @@ +@@ -235,11 +235,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -10761,7 +10761,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ip22 # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -319,9 +314,11 @@ +@@ -319,9 +314,11 @@ CONFIG_SGIWD93_SCSI=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -10773,7 +10773,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ip22 # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -488,7 +485,6 @@ +@@ -488,7 +485,6 @@ CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_TXX9_CONSOLE is not set # CONFIG_TXX927_SERIAL is not set CONFIG_IP22_SERIAL=y @@ -10783,9 +10783,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ip22 Index: linux-2.4.35.4/arch/mips64/defconfig-ip27 =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-ip27 2007-12-15 05:19:43.618906739 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig-ip27 2007-12-15 05:19:44.878978546 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig-ip27 ++++ linux-2.4.35.4/arch/mips64/defconfig-ip27 +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -10795,7 +10795,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ip27 # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -470,9 +470,11 @@ +@@ -470,9 +470,11 @@ CONFIG_SCSI_LOGGING=y # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -10807,7 +10807,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ip27 # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -658,7 +660,6 @@ +@@ -658,7 +660,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -10817,9 +10817,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ip27 Index: linux-2.4.35.4/arch/mips64/defconfig-jaguar =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-jaguar 2007-12-15 05:19:43.626907195 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig-jaguar 2007-12-15 05:19:44.882978773 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig-jaguar ++++ linux-2.4.35.4/arch/mips64/defconfig-jaguar +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -10829,7 +10829,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-jaguar # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -227,11 +227,6 @@ +@@ -227,11 +227,6 @@ CONFIG_IP_PNP_DHCP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -10841,7 +10841,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-jaguar # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -403,7 +398,6 @@ +@@ -403,7 +398,6 @@ CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_TXX9 is not set # CONFIG_SERIAL_TXX9_CONSOLE is not set # CONFIG_TXX927_SERIAL is not set @@ -10851,9 +10851,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-jaguar Index: linux-2.4.35.4/arch/mips64/defconfig-malta =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-malta 2007-12-15 05:19:43.634907650 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig-malta 2007-12-15 05:19:44.882978773 +0100 -@@ -22,16 +22,19 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig-malta ++++ linux-2.4.35.4/arch/mips64/defconfig-malta +@@ -22,16 +22,19 @@ CONFIG_KMOD=y # # CONFIG_ACER_PICA_61 is not set # CONFIG_MIPS_BOSPORUS is not set @@ -10874,7 +10874,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-malta # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -146,9 +149,9 @@ +@@ -146,9 +149,9 @@ CONFIG_KCORE_ELF=y CONFIG_BINFMT_ELF=y CONFIG_MIPS32_COMPAT=y CONFIG_MIPS32_O32=y @@ -10886,7 +10886,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-malta # CONFIG_OOM_KILLER is not set # CONFIG_CMDLINE_BOOL is not set -@@ -235,11 +238,6 @@ +@@ -235,11 +238,6 @@ CONFIG_IP_PNP_BOOTP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -10898,7 +10898,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-malta # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -271,8 +269,83 @@ +@@ -271,8 +269,83 @@ CONFIG_IP_PNP_BOOTP=y # # ATA/IDE/MFM/RLL support # @@ -10983,7 +10983,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-malta # # SCSI support -@@ -317,9 +390,11 @@ +@@ -317,9 +390,11 @@ CONFIG_SD_EXTRA_DEVS=40 # CONFIG_SCSI_MEGARAID is not set # CONFIG_SCSI_MEGARAID2 is not set # CONFIG_SCSI_SATA is not set @@ -10995,7 +10995,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-malta # CONFIG_SCSI_SATA_PROMISE is not set # CONFIG_SCSI_SATA_SX4 is not set # CONFIG_SCSI_SATA_SIL is not set -@@ -477,7 +552,6 @@ +@@ -477,7 +552,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -11005,9 +11005,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-malta Index: linux-2.4.35.4/arch/mips64/defconfig-ocelotc =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-ocelotc 2007-12-15 05:19:43.638907879 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig-ocelotc 2007-12-15 05:19:44.882978773 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig-ocelotc ++++ linux-2.4.35.4/arch/mips64/defconfig-ocelotc +@@ -30,8 +30,8 @@ CONFIG_KMOD=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -11017,7 +11017,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ocelotc # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -231,11 +231,6 @@ +@@ -231,11 +231,6 @@ CONFIG_IP_PNP_DHCP=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -11029,7 +11029,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ocelotc # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -453,7 +448,6 @@ +@@ -453,7 +448,6 @@ CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_TXX9 is not set # CONFIG_SERIAL_TXX9_CONSOLE is not set # CONFIG_TXX927_SERIAL is not set @@ -11039,9 +11039,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-ocelotc Index: linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-sb1250-swarm 2007-12-15 05:19:43.646908334 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm 2007-12-15 05:19:44.882978773 +0100 -@@ -30,8 +30,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig-sb1250-swarm ++++ linux-2.4.35.4/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_MIPS_PB1500 is not set @@ -11051,7 +11051,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -90,6 +90,7 @@ +@@ -90,6 +90,7 @@ CONFIG_SIBYTE_CFE=y # CONFIG_SIBYTE_TBPROF is not set CONFIG_SIBYTE_GENBUS_IDE=y CONFIG_SMP_CAPABLE=y @@ -11059,7 +11059,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm # CONFIG_SNI_RM200_PCI is not set # CONFIG_TANBAC_TB0226 is not set # CONFIG_TANBAC_TB0229 is not set -@@ -253,11 +254,6 @@ +@@ -253,11 +254,6 @@ CONFIG_INET=y # # CONFIG_IPX is not set # CONFIG_ATALK is not set @@ -11071,7 +11071,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set # CONFIG_X25 is not set -@@ -432,7 +428,6 @@ +@@ -432,7 +428,6 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_SIBYTE_SB1250_DUART=y CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y CONFIG_SERIAL_CONSOLE=y @@ -11081,9 +11081,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-sb1250-swarm Index: linux-2.4.35.4/arch/mips64/defconfig-sead =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/defconfig-sead 2007-12-15 05:19:43.654908790 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig-sead 2007-12-15 05:19:44.886979002 +0100 -@@ -28,8 +28,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig-sead ++++ linux-2.4.35.4/arch/mips64/defconfig-sead +@@ -28,8 +28,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MIPS_PB1000 is not set # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set @@ -11093,7 +11093,7 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-sead # CONFIG_MIPS_XXS1500 is not set # CONFIG_MIPS_MTX1 is not set # CONFIG_COGENT_CSB250 is not set -@@ -242,7 +242,6 @@ +@@ -242,7 +242,6 @@ CONFIG_SERIAL=y CONFIG_SERIAL_CONSOLE=y # CONFIG_SERIAL_EXTENDED is not set # CONFIG_SERIAL_NONSTANDARD is not set @@ -11103,9 +11103,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig-sead # Index: linux-2.4.35.4/arch/mips64/kernel/binfmt_elfn32.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/binfmt_elfn32.c 2007-12-15 05:19:43.662909245 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/binfmt_elfn32.c 2007-12-15 05:19:44.894979457 +0100 -@@ -116,4 +116,7 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/binfmt_elfn32.c ++++ linux-2.4.35.4/arch/mips64/kernel/binfmt_elfn32.c +@@ -116,4 +116,7 @@ MODULE_AUTHOR("Ralf Baechle (ralf@linux- #undef MODULE_DESCRIPTION #undef MODULE_AUTHOR @@ -11115,9 +11115,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/binfmt_elfn32.c #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 2007-12-15 05:19:43.670909700 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/binfmt_elfo32.c 2007-12-15 05:19:44.898979686 +0100 -@@ -137,4 +137,7 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/binfmt_elfo32.c ++++ linux-2.4.35.4/arch/mips64/kernel/binfmt_elfo32.c +@@ -137,4 +137,7 @@ MODULE_AUTHOR("Ralf Baechle (ralf@linux- #undef MODULE_DESCRIPTION #undef MODULE_AUTHOR @@ -11127,9 +11127,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/binfmt_elfo32.c #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 2007-12-15 05:19:43.674909929 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/head.S 2007-12-15 05:19:44.898979686 +0100 -@@ -91,6 +91,21 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/head.S ++++ linux-2.4.35.4/arch/mips64/kernel/head.S +@@ -91,6 +91,21 @@ EXPORT(_stext) __INIT NESTED(kernel_entry, 16, sp) # kernel entry point @@ -11151,7 +11151,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/head.S ori sp, 0xf # align stack on 16 byte. xori sp, 0xf -@@ -103,8 +118,6 @@ +@@ -103,8 +118,6 @@ NESTED(kernel_entry, 16, sp) # kernel ARC64_TWIDDLE_PC @@ -11160,7 +11160,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/head.S /* * The firmware/bootloader passes argc/argp/envp * to us as arguments. But clear bss first because -@@ -125,6 +138,7 @@ +@@ -125,6 +138,7 @@ NESTED(kernel_entry, 16, sp) # kernel dsubu sp, 4*SZREG # init stack pointer j init_arch @@ -11168,7 +11168,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/head.S END(kernel_entry) #ifdef CONFIG_SMP -@@ -133,6 +147,23 @@ +@@ -133,6 +147,23 @@ NESTED(kernel_entry, 16, sp) # kernel * function after setting up the stack and gp registers. */ NESTED(smp_bootstrap, 16, sp) @@ -11192,7 +11192,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/head.S #ifdef CONFIG_SGI_IP27 GET_NASID_ASM t1 dli t0, KLDIR_OFFSET + (KLI_KERN_VARS * KLDIR_ENT_SIZE) + \ -@@ -146,19 +177,8 @@ +@@ -146,19 +177,8 @@ NESTED(smp_bootstrap, 16, sp) ARC64_TWIDDLE_PC #endif /* CONFIG_SGI_IP27 */ @@ -11215,9 +11215,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/head.S Index: linux-2.4.35.4/arch/mips64/kernel/ioctl32.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/ioctl32.c 2007-12-15 05:19:43.682910385 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/ioctl32.c 2007-12-15 05:19:44.898979686 +0100 -@@ -2352,7 +2352,7 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/ioctl32.c ++++ linux-2.4.35.4/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_EXPIRE_MULTI), @@ -11228,9 +11228,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/ioctl32.c 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 2007-12-15 05:19:43.690910840 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/linux32.c 2007-12-15 05:19:44.902979912 +0100 -@@ -1101,6 +1101,7 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/linux32.c ++++ linux-2.4.35.4/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 */ @@ -11238,7 +11238,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/linux32.c if (inode->i_sock) { int err; err = sock_readv_writev(type, inode, file, iov, count, tot_len); -@@ -1187,72 +1188,19 @@ +@@ -1187,72 +1188,19 @@ bad_file: lseek back to original location. They fail just like lseek does on non-seekable files. */ @@ -11318,9 +11318,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/linux32.c * 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 2007-12-15 05:19:43.698911298 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/process.c 2007-12-15 05:19:44.902979912 +0100 -@@ -125,6 +125,25 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/process.c ++++ linux-2.4.35.4/arch/mips64/kernel/process.c +@@ -125,6 +125,25 @@ int dump_fpu(struct pt_regs *regs, elf_f return 1; } @@ -11348,9 +11348,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/process.c */ Index: linux-2.4.35.4/arch/mips64/kernel/scall_64.S =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/scall_64.S 2007-12-15 05:19:43.702911525 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/scall_64.S 2007-12-15 05:19:44.902979912 +0100 -@@ -102,15 +102,14 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/scall_64.S ++++ linux-2.4.35.4/arch/mips64/kernel/scall_64.S +@@ -102,15 +102,14 @@ _64_reschedule: trace_a_syscall: SAVE_STATIC @@ -11370,9 +11370,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/scall_64.S 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 2007-12-15 05:19:43.710911980 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/scall_n32.S 2007-12-15 05:19:44.902979912 +0100 -@@ -106,15 +106,14 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/scall_n32.S ++++ linux-2.4.35.4/arch/mips64/kernel/scall_n32.S +@@ -106,15 +106,14 @@ n32_reschedule: trace_a_syscall: SAVE_STATIC @@ -11392,9 +11392,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/scall_n32.S 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 2007-12-15 05:19:43.718912438 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/scall_o32.S 2007-12-15 05:19:44.906980142 +0100 -@@ -118,9 +118,8 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/scall_o32.S ++++ linux-2.4.35.4/arch/mips64/kernel/scall_o32.S +@@ -118,9 +118,8 @@ trace_a_syscall: sd a6, PT_R10(sp) sd a7, PT_R11(sp) @@ -11405,7 +11405,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/scall_o32.S ld a0, PT_R4(sp) # Restore argument registers ld a1, PT_R5(sp) -@@ -129,7 +128,7 @@ +@@ -129,7 +128,7 @@ trace_a_syscall: ld a4, PT_R8(sp) ld a5, PT_R9(sp) @@ -11414,7 +11414,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/scall_o32.S li t0, -EMAXERRNO - 1 # error? sltu t0, t0, v0 -@@ -576,6 +575,8 @@ +@@ -576,6 +575,8 @@ out: jr ra sys_call_table: syscalltable @@ -11425,9 +11425,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/scall_o32.S .endm Index: linux-2.4.35.4/arch/mips64/kernel/setup.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/setup.c 2007-12-15 05:19:43.726912894 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/setup.c 2007-12-15 05:19:44.906980142 +0100 -@@ -129,14 +129,6 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/setup.c ++++ linux-2.4.35.4/arch/mips64/kernel/setup.c +@@ -129,14 +129,6 @@ asmlinkage void __init init_arch(int arg */ load_mmu(); @@ -11444,9 +11444,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/setup.c Index: linux-2.4.35.4/arch/mips64/kernel/signal_n32.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/signal_n32.c 2007-12-15 05:19:43.730913120 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/signal_n32.c 2007-12-15 05:19:44.906980142 +0100 -@@ -68,7 +68,7 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/signal_n32.c ++++ linux-2.4.35.4/arch/mips64/kernel/signal_n32.c +@@ -68,7 +68,7 @@ struct rt_sigframe_n32 { }; extern asmlinkage int restore_sigcontext(struct pt_regs *regs, struct sigcontext *sc); @@ -11457,9 +11457,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/signal_n32.c { Index: linux-2.4.35.4/arch/mips64/kernel/traps.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/traps.c 2007-12-15 05:19:43.738913578 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/traps.c 2007-12-15 05:19:44.906980142 +0100 -@@ -462,9 +462,10 @@ +--- linux-2.4.35.4.orig/arch/mips64/kernel/traps.c ++++ linux-2.4.35.4/arch/mips64/kernel/traps.c +@@ -462,9 +462,10 @@ static inline void simulate_ll(struct pt } ll_task = current; @@ -11471,7 +11471,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/traps.c return; sig: -@@ -495,8 +496,8 @@ +@@ -495,8 +496,8 @@ static inline void simulate_sc(struct pt goto sig; } if (ll_bit == 0 || ll_task != current) { @@ -11481,7 +11481,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/traps.c return; } -@@ -505,9 +506,9 @@ +@@ -505,9 +506,9 @@ static inline void simulate_sc(struct pt goto sig; } @@ -11492,7 +11492,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/traps.c return; sig: -@@ -809,13 +810,18 @@ +@@ -809,13 +810,18 @@ extern asmlinkage int fpu_emulator_resto void __init per_cpu_trap_init(void) { unsigned int cpu = smp_processor_id(); @@ -11516,7 +11516,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/traps.c /* * Some MIPS CPUs have a dedicated interrupt vector which reduces the -@@ -825,13 +831,11 @@ +@@ -825,13 +831,11 @@ void __init per_cpu_trap_init(void) set_c0_cause(CAUSEF_IV); cpu_data[cpu].asid_cache = ASID_FIRST_VERSION; @@ -11532,7 +11532,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/traps.c enter_lazy_tlb(&init_mm, current, cpu); } -@@ -842,8 +846,6 @@ +@@ -842,8 +846,6 @@ void __init trap_init(void) extern char except_vec4; unsigned long i; @@ -11541,7 +11541,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/traps.c /* Copy the generic exception handlers to their final destination. */ memcpy((void *) KSEG0 , &except_vec0_generic, 0x80); memcpy((void *)(KSEG0 + 0x180), &except_vec3_generic, 0x80); -@@ -933,6 +935,5 @@ +@@ -933,6 +935,5 @@ void __init trap_init(void) flush_icache_range(KSEG0, KSEG0 + 0x400); @@ -11551,9 +11551,9 @@ Index: linux-2.4.35.4/arch/mips64/kernel/traps.c } Index: linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/mm/cerr-sb1.c 2007-12-15 05:19:43.746914033 +0100 -+++ linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c 2007-12-15 05:19:44.906980142 +0100 -@@ -252,14 +252,14 @@ +--- linux-2.4.35.4.orig/arch/mips64/mm/cerr-sb1.c ++++ linux-2.4.35.4/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] */ static const uint64_t mask_72_64[8] = { @@ -11576,7 +11576,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c }; /* Calculate the parity on a range of bits */ -@@ -331,9 +331,9 @@ +@@ -331,9 +331,9 @@ static uint32_t extract_ic(unsigned shor ((lru >> 4) & 0x3), ((lru >> 6) & 0x3)); } @@ -11588,7 +11588,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c valid = ((taghi >> 29) & 1); if (valid) { tlo_tmp = taglo & 0xfff3ff; -@@ -474,7 +474,7 @@ +@@ -474,7 +474,7 @@ static uint32_t extract_dc(unsigned shor : "r" ((way << 13) | addr)); taglo = ((unsigned long long)taglohi << 32) | taglolo; @@ -11599,9 +11599,9 @@ Index: linux-2.4.35.4/arch/mips64/mm/cerr-sb1.c 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 2007-12-15 05:19:43.754914488 +0100 -+++ linux-2.4.35.4/arch/mips64/mm/c-r4k.c 2007-12-15 05:19:44.910980368 +0100 -@@ -867,9 +867,16 @@ +--- linux-2.4.35.4.orig/arch/mips64/mm/c-r4k.c ++++ linux-2.4.35.4/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. */ @@ -11621,7 +11621,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/c-r4k.c switch (c->cputype) { case CPU_20KC: -@@ -1070,9 +1077,6 @@ +@@ -1070,9 +1077,6 @@ void __init ld_mmu_r4xx0(void) setup_scache(); coherency_setup(); @@ -11633,9 +11633,9 @@ Index: linux-2.4.35.4/arch/mips64/mm/c-r4k.c 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 2007-12-15 05:19:43.762914944 +0100 -+++ linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S 2007-12-15 05:19:44.910980368 +0100 -@@ -125,6 +125,33 @@ +--- linux-2.4.35.4.orig/arch/mips64/mm/tlbex-r4k.S ++++ linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S +@@ -125,6 +125,33 @@ LEAF(except_vec1_r4k) nop END(except_vec1_r4k) @@ -11669,7 +11669,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S LEAF(except_vec1_sb1) #if BCM1250_M3_WAR dmfc0 k0, CP0_BADVADDR -@@ -134,28 +161,24 @@ +@@ -134,28 +161,24 @@ LEAF(except_vec1_sb1) bnez k0, 1f #endif .set noat @@ -11702,7 +11702,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S eret 9: # handle the vmalloc range -@@ -163,13 +186,10 @@ +@@ -163,13 +186,10 @@ LEAF(handle_vec1_r4k) ld k0, 0(k1) # get even pte ld k1, 8(k1) # get odd pte PTE_RELOAD k0 k1 @@ -11719,7 +11719,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S __INIT -@@ -195,10 +215,8 @@ +@@ -195,10 +215,8 @@ LEAF(handle_vec1_r10k) ld k0, 0(k1) # get even pte ld k1, 8(k1) # get odd pte PTE_RELOAD k0 k1 @@ -11731,7 +11731,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S eret 9: # handle the vmalloc range -@@ -206,10 +224,8 @@ +@@ -206,10 +224,8 @@ LEAF(handle_vec1_r10k) ld k0, 0(k1) # get even pte ld k1, 8(k1) # get odd pte PTE_RELOAD k0 k1 @@ -11745,8 +11745,8 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlbex-r4k.S Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/mm/tlb-r4k.c 2007-12-15 05:19:43.770915399 +0100 -+++ linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c 2007-12-15 05:19:44.910980368 +0100 +--- linux-2.4.35.4.orig/arch/mips64/mm/tlb-r4k.c ++++ linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c @@ -1,24 +1,12 @@ /* - * Carsten Langgaard, carstenl@mips.com @@ -11788,7 +11788,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c extern void except_vec1_r4k(void); /* CP0 hazard avoidance. */ -@@ -46,31 +31,23 @@ +@@ -46,31 +31,23 @@ void local_flush_tlb_all(void) unsigned long old_ctx; int entry; @@ -11824,7 +11824,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c write_c0_entryhi(old_ctx); local_irq_restore(flags); } -@@ -79,12 +56,8 @@ +@@ -79,12 +56,8 @@ void local_flush_tlb_mm(struct mm_struct { int cpu = smp_processor_id(); @@ -11838,7 +11838,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c } void local_flush_tlb_range(struct mm_struct *mm, unsigned long start, -@@ -96,10 +69,6 @@ +@@ -96,10 +69,6 @@ void local_flush_tlb_range(struct mm_str unsigned long flags; int size; @@ -11849,7 +11849,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c local_irq_save(flags); size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT; size = (size + 1) >> 1; -@@ -110,25 +79,25 @@ +@@ -110,25 +79,25 @@ void local_flush_tlb_range(struct mm_str start &= (PAGE_MASK << 1); end += ((PAGE_SIZE << 1) - 1); end &= (PAGE_MASK << 1); @@ -11880,7 +11880,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c write_c0_entryhi(oldpid); } else { drop_mmu_context(mm, cpu); -@@ -145,28 +114,26 @@ +@@ -145,28 +114,26 @@ void local_flush_tlb_page(struct vm_area unsigned long flags; unsigned long oldpid, newpid, idx; @@ -11914,7 +11914,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c write_c0_entryhi(oldpid); local_irq_restore(flags); } -@@ -186,7 +153,7 @@ +@@ -186,7 +153,7 @@ void local_flush_tlb_one(unsigned long p local_irq_save(flags); write_c0_entryhi(page); @@ -11923,7 +11923,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c tlb_probe(); BARRIER; idx = read_c0_index(); -@@ -195,10 +162,12 @@ +@@ -195,10 +162,12 @@ void local_flush_tlb_one(unsigned long p if (idx >= 0) { /* Make sure all entries differ. */ write_c0_entryhi(KSEG0+idx*0x2000); @@ -11937,7 +11937,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c local_irq_restore(flags); } -@@ -208,7 +177,6 @@ +@@ -208,7 +177,6 @@ void local_flush_tlb_one(unsigned long p void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte) { unsigned long flags; @@ -11945,7 +11945,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c pgd_t *pgdp; pmd_t *pmdp; pte_t *ptep; -@@ -222,70 +190,58 @@ +@@ -222,70 +190,58 @@ void __update_tlb(struct vm_area_struct pid = read_c0_entryhi() & ASID_MASK; @@ -12051,7 +12051,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c } /* -@@ -317,17 +273,15 @@ +@@ -317,17 +273,15 @@ __init int add_temporary_entry(unsigned } write_c0_index(temp_tlb_entry); @@ -12071,7 +12071,7 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c write_c0_pagemask(old_pagemask); out: local_irq_restore(flags); -@@ -348,15 +302,23 @@ +@@ -348,15 +302,23 @@ static void __init probe_tlb(unsigned lo return; config1 = read_c0_config1(); @@ -12100,9 +12100,9 @@ Index: linux-2.4.35.4/arch/mips64/mm/tlb-r4k.c 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 2007-12-15 05:19:43.778915857 +0100 -+++ linux-2.4.35.4/drivers/char/au1000_gpio.c 2007-12-15 05:19:44.910980368 +0100 -@@ -246,7 +246,7 @@ +--- linux-2.4.35.4.orig/drivers/char/au1000_gpio.c ++++ linux-2.4.35.4/drivers/char/au1000_gpio.c +@@ -246,7 +246,7 @@ static struct file_operations au1000gpio static struct miscdevice au1000gpio_miscdev = { @@ -12113,8 +12113,8 @@ Index: linux-2.4.35.4/drivers/char/au1000_gpio.c }; Index: linux-2.4.35.4/drivers/char/au1550_psc_spi.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/char/au1550_psc_spi.c 2007-12-15 05:19:44.914980597 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/char/au1550_psc_spi.c @@ -0,0 +1,466 @@ +/* + * Driver for Alchemy Au1550 SPI on the PSC. @@ -12584,9 +12584,9 @@ Index: linux-2.4.35.4/drivers/char/au1550_psc_spi.c +module_exit(au1550spi_exit); Index: linux-2.4.35.4/drivers/char/Config.in =================================================================== ---- linux-2.4.35.4.orig/drivers/char/Config.in 2007-12-15 05:19:43.790916539 +0100 -+++ linux-2.4.35.4/drivers/char/Config.in 2007-12-15 05:19:44.914980597 +0100 -@@ -314,14 +314,11 @@ +--- linux-2.4.35.4.orig/drivers/char/Config.in ++++ linux-2.4.35.4/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 @@ -12603,7 +12603,7 @@ Index: linux-2.4.35.4/drivers/char/Config.in fi if [ "$CONFIG_TOSHIBA_RBTX4927" = "y" -o "$CONFIG_TOSHIBA_JMR3927" = "y" ]; then tristate 'Dallas DS1742 RTC support' CONFIG_DS1742 -@@ -384,6 +381,11 @@ +@@ -384,6 +381,11 @@ if [ "$CONFIG_DRM" = "y" ]; then source drivers/char/drm/Config.in fi fi @@ -12615,7 +12615,7 @@ Index: linux-2.4.35.4/drivers/char/Config.in endmenu if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then -@@ -392,6 +394,7 @@ +@@ -392,6 +394,7 @@ fi if [ "$CONFIG_SOC_AU1X00" = "y" ]; then tristate ' Alchemy Au1x00 GPIO device support' CONFIG_AU1X00_GPIO tristate ' Au1000/ADS7846 touchscreen support' CONFIG_TS_AU1X00_ADS7846 @@ -12625,8 +12625,8 @@ Index: linux-2.4.35.4/drivers/char/Config.in 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 2007-12-15 05:19:43.798916997 +0100 -+++ linux-2.4.35.4/drivers/char/decserial.c 2007-12-15 05:19:44.914980597 +0100 +--- linux-2.4.35.4.orig/drivers/char/decserial.c ++++ linux-2.4.35.4/drivers/char/decserial.c @@ -3,95 +3,105 @@ * choose the right serial device at boot time * @@ -12779,8 +12779,8 @@ Index: linux-2.4.35.4/drivers/char/decserial.c Index: linux-2.4.35.4/drivers/char/ds1286.c =================================================================== ---- linux-2.4.35.4.orig/drivers/char/ds1286.c 2007-12-15 05:19:43.806917453 +0100 -+++ linux-2.4.35.4/drivers/char/ds1286.c 2007-12-15 05:19:44.914980597 +0100 +--- linux-2.4.35.4.orig/drivers/char/ds1286.c ++++ linux-2.4.35.4/drivers/char/ds1286.c @@ -1,6 +1,10 @@ /* * DS1286 Real Time Clock interface for Linux @@ -12800,7 +12800,7 @@ Index: linux-2.4.35.4/drivers/char/ds1286.c #include <linux/slab.h> #include <linux/ioport.h> #include <linux/fcntl.h> -@@ -95,6 +100,12 @@ +@@ -95,6 +100,12 @@ static ssize_t ds1286_read(struct file * return -EIO; } @@ -12813,7 +12813,7 @@ Index: linux-2.4.35.4/drivers/char/ds1286.c static int ds1286_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { -@@ -249,23 +260,22 @@ +@@ -249,23 +260,22 @@ static int ds1286_open(struct inode *ino { spin_lock_irq(&ds1286_lock); @@ -12844,7 +12844,7 @@ Index: linux-2.4.35.4/drivers/char/ds1286.c return 0; } -@@ -276,32 +286,6 @@ +@@ -276,32 +286,6 @@ static unsigned int ds1286_poll(struct f return 0; } @@ -12877,7 +12877,7 @@ Index: linux-2.4.35.4/drivers/char/ds1286.c static char *days[] = { "***", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; -@@ -528,3 +512,38 @@ +@@ -528,3 +512,38 @@ void ds1286_get_alm_time(struct rtc_time BCD_TO_BIN(alm_tm->tm_hour); alm_tm->tm_sec = 0; } @@ -12918,9 +12918,9 @@ Index: linux-2.4.35.4/drivers/char/ds1286.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/char/ds1742.c =================================================================== ---- linux-2.4.35.4.orig/drivers/char/ds1742.c 2007-12-15 05:19:43.814917908 +0100 -+++ linux-2.4.35.4/drivers/char/ds1742.c 2007-12-15 05:19:44.918980826 +0100 -@@ -142,6 +142,7 @@ +--- linux-2.4.35.4.orig/drivers/char/ds1742.c ++++ linux-2.4.35.4/drivers/char/ds1742.c +@@ -142,6 +142,7 @@ static int rtc_ds1742_set_time(unsigned CMOS_WRITE(RTC_WRITE, RTC_CONTROL); /* convert */ @@ -12928,7 +12928,7 @@ Index: linux-2.4.35.4/drivers/char/ds1742.c to_tm(t, &tm); /* check each field one by one */ -@@ -216,6 +217,7 @@ +@@ -216,6 +217,7 @@ static int get_ds1742_status(char *buf) unsigned long curr_time; curr_time = rtc_ds1742_get_time(); @@ -12936,7 +12936,7 @@ Index: linux-2.4.35.4/drivers/char/ds1742.c to_tm(curr_time, &tm); p = buf; -@@ -251,8 +253,8 @@ +@@ -251,8 +253,8 @@ static int ds1742_read_proc(char *page, void rtc_ds1742_wait(void) { @@ -12947,7 +12947,7 @@ Index: linux-2.4.35.4/drivers/char/ds1742.c } static int ds1742_ioctl(struct inode *inode, struct file *file, -@@ -264,6 +266,7 @@ +@@ -264,6 +266,7 @@ static int ds1742_ioctl(struct inode *in switch (cmd) { case RTC_RD_TIME: /* Read the time/date from RTC */ curr_time = rtc_ds1742_get_time(); @@ -12957,9 +12957,9 @@ Index: linux-2.4.35.4/drivers/char/ds1742.c 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 2007-12-15 05:19:43.822918363 +0100 -+++ linux-2.4.35.4/drivers/char/dummy_keyb.c 2007-12-15 05:19:44.918980826 +0100 -@@ -141,3 +141,7 @@ +--- linux-2.4.35.4.orig/drivers/char/dummy_keyb.c ++++ linux-2.4.35.4/drivers/char/dummy_keyb.c +@@ -141,3 +141,7 @@ void __init kbd_init_hw(void) { printk("Dummy keyboard driver installed.\n"); } @@ -12969,8 +12969,8 @@ Index: linux-2.4.35.4/drivers/char/dummy_keyb.c +#endif Index: linux-2.4.35.4/drivers/char/dz.c =================================================================== ---- linux-2.4.35.4.orig/drivers/char/dz.c 2007-12-15 05:19:43.826918593 +0100 -+++ linux-2.4.35.4/drivers/char/dz.c 2007-12-15 05:19:44.918980826 +0100 +--- linux-2.4.35.4.orig/drivers/char/dz.c ++++ linux-2.4.35.4/drivers/char/dz.c @@ -1,11 +1,13 @@ /* - * dz.c: Serial port driver for DECStations equiped @@ -13067,7 +13067,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c /* * ------------------------------------------------------------ * dz_in () and dz_out () -@@ -94,15 +120,16 @@ +@@ -94,15 +120,16 @@ static inline unsigned short dz_in(struc { volatile unsigned short *addr = (volatile unsigned short *) (info->port + offset); @@ -13085,7 +13085,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c *addr = value; } -@@ -143,25 +170,24 @@ +@@ -143,25 +170,24 @@ static void dz_start(struct tty_struct * tmp |= mask; /* set the TX flag */ dz_out(info, DZ_TCR, tmp); @@ -13118,7 +13118,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c * * ------------------------------------------------------------ */ -@@ -188,101 +214,97 @@ +@@ -188,101 +214,97 @@ static inline void dz_sched_event(struct * This routine deals with inputs from any lines. * ------------------------------------------------------------ */ @@ -13295,7 +13295,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c } /* -@@ -292,20 +314,34 @@ +@@ -292,20 +314,34 @@ static inline void receive_chars(struct * This routine deals with outputs to any lines. * ------------------------------------------------------------ */ @@ -13333,7 +13333,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c dz_stop(info->tty); return; } -@@ -359,15 +395,14 @@ +@@ -359,15 +395,14 @@ static inline void check_modem_status(st */ static void dz_interrupt(int irq, void *dev, struct pt_regs *regs) { @@ -13352,7 +13352,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c if (status & DZ_TRDY) transmit_chars(info); -@@ -514,7 +549,7 @@ +@@ -514,7 +549,7 @@ static void shutdown(struct dz_serial *i info->cflags &= ~DZ_CREAD; /* turn off receive enable flag */ @@ -13361,7 +13361,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c if (info->xmit_buf) { /* free Tx buffer */ free_page((unsigned long) info->xmit_buf); -@@ -545,18 +580,21 @@ +@@ -545,18 +580,21 @@ static void change_speed(struct dz_seria { unsigned long flags; unsigned cflag; @@ -13388,7 +13388,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c switch (cflag & CSIZE) { case CS5: info->cflags |= DZ_CS5; -@@ -579,7 +617,16 @@ +@@ -579,7 +617,16 @@ static void change_speed(struct dz_seria if (cflag & PARODD) info->cflags |= DZ_PARODD; @@ -13406,7 +13406,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c switch (baud) { case 50: info->cflags |= DZ_B50; -@@ -629,16 +676,16 @@ +@@ -629,16 +676,16 @@ static void change_speed(struct dz_seria } info->cflags |= DZ_RXENAB; @@ -13426,7 +13426,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c info->ignore_status_mask |= (DZ_FERR | DZ_PERR); restore_flags(flags); -@@ -694,7 +741,7 @@ +@@ -694,7 +741,7 @@ static int dz_write(struct tty_struct *t down(&tmp_buf_sem); while (1) { @@ -13435,7 +13435,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c if (c <= 0) break; -@@ -707,7 +754,7 @@ +@@ -707,7 +754,7 @@ static int dz_write(struct tty_struct *t save_flags(flags); cli(); @@ -13444,7 +13444,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c memcpy(info->xmit_buf + info->xmit_head, tmp_buf, c); info->xmit_head = ((info->xmit_head + c) & (DZ_XMIT_SIZE - 1)); info->xmit_cnt += c; -@@ -727,7 +774,7 @@ +@@ -727,7 +774,7 @@ static int dz_write(struct tty_struct *t save_flags(flags); cli(); @@ -13453,7 +13453,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c if (c <= 0) { restore_flags(flags); break; -@@ -845,7 +892,7 @@ +@@ -845,7 +892,7 @@ static void dz_send_xchar(struct tty_str /* * ------------------------------------------------------------ @@ -13462,7 +13462,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c * ------------------------------------------------------------ */ static int get_serial_info(struct dz_serial *info, -@@ -958,6 +1005,9 @@ +@@ -958,6 +1005,9 @@ static int dz_ioctl(struct tty_struct *t struct dz_serial *info = (struct dz_serial *) tty->driver_data; int retval; @@ -13472,7 +13472,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGWILD) && (cmd != TIOCSERSWILD) && (cmd != TIOCSERGSTRUCT)) { -@@ -1252,19 +1302,14 @@ +@@ -1252,19 +1302,14 @@ static int dz_open(struct tty_struct *tt int retval, line; line = MINOR(tty->device) - tty->driver.minor_start; @@ -13494,7 +13494,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c tty->driver_data = info; info->tty = tty; -@@ -1285,14 +1330,21 @@ +@@ -1285,14 +1330,21 @@ static int dz_open(struct tty_struct *tt else *tty->termios = info->callout_termios; change_speed(info); @@ -13518,7 +13518,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c { printk("%s%s\n", dz_name, dz_version); } -@@ -1300,7 +1352,6 @@ +@@ -1300,7 +1352,6 @@ static void show_serial_version(void) int __init dz_init(void) { int i; @@ -13526,7 +13526,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c struct dz_serial *info; /* Setup base handler, and timer table. */ -@@ -1311,9 +1362,9 @@ +@@ -1311,9 +1362,9 @@ int __init dz_init(void) memset(&serial_driver, 0, sizeof(struct tty_driver)); serial_driver.magic = TTY_DRIVER_MAGIC; #if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS)) @@ -13538,7 +13538,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c #endif serial_driver.major = TTY_MAJOR; serial_driver.minor_start = 64; -@@ -1352,9 +1403,9 @@ +@@ -1352,9 +1403,9 @@ int __init dz_init(void) */ callout_driver = serial_driver; #if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS)) @@ -13550,7 +13550,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c #endif callout_driver.major = TTYAUX_MAJOR; callout_driver.subtype = SERIAL_TYPE_CALLOUT; -@@ -1363,25 +1414,27 @@ +@@ -1363,25 +1414,27 @@ int __init dz_init(void) panic("Couldn't register serial driver"); if (tty_register_driver(&callout_driver)) panic("Couldn't register callout driver"); @@ -13585,7 +13585,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c info->event = 0; info->count = 0; info->blocked_open = 0; -@@ -1393,25 +1446,16 @@ +@@ -1393,25 +1446,16 @@ int __init dz_init(void) info->normal_termios = serial_driver.init_termios; init_waitqueue_head(&info->open_wait); init_waitqueue_head(&info->close_wait); @@ -13616,7 +13616,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c dz_out(info, DZ_CSR, DZ_CLR); while (dz_in(info, DZ_CSR) & DZ_CLR); iob(); -@@ -1420,43 +1464,104 @@ +@@ -1420,43 +1464,104 @@ int __init dz_init(void) dz_out(info, DZ_CSR, DZ_MSE); #endif @@ -13743,7 +13743,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c /* * ------------------------------------------------------------------- * dz_console_print () -@@ -1465,17 +1570,19 @@ +@@ -1465,17 +1570,19 @@ static void dz_console_put_char(unsigned * The console must be locked when we get here. * ------------------------------------------------------------------- */ @@ -13766,7 +13766,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c } } -@@ -1486,12 +1593,12 @@ +@@ -1486,12 +1593,12 @@ static kdev_t dz_console_device(struct c static int __init dz_console_setup(struct console *co, char *options) { @@ -13780,7 +13780,7 @@ Index: linux-2.4.35.4/drivers/char/dz.c if (options) { baud = simple_strtoul(options, NULL, 10); -@@ -1542,44 +1649,31 @@ +@@ -1542,44 +1649,31 @@ static int __init dz_console_setup(struc } co->cflag = cflag; @@ -13842,8 +13842,8 @@ Index: linux-2.4.35.4/drivers/char/dz.c 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 2007-12-15 05:19:43.834919048 +0100 -+++ linux-2.4.35.4/drivers/char/dz.h 2007-12-15 05:19:44.918980826 +0100 +--- linux-2.4.35.4.orig/drivers/char/dz.h ++++ linux-2.4.35.4/drivers/char/dz.h @@ -10,6 +10,8 @@ #ifndef DZ_SERIAL_H #define DZ_SERIAL_H @@ -13911,7 +13911,7 @@ Index: linux-2.4.35.4/drivers/char/dz.h #define DZ_SPLIT_TERMIOS 0x0008 /* Separate termios for dialin/callout */ #define DZ_SESSION_LOCKOUT 0x0100 /* Lock out cua opens based on session */ #define DZ_PGRP_LOCKOUT 0x0200 /* Lock out cua opens based on pgrp */ -@@ -166,79 +178,9 @@ +@@ -166,79 +178,9 @@ struct dz_serial { long session; /* Session of opening process */ long pgrp; /* pgrp of opening process */ @@ -13994,8 +13994,8 @@ Index: linux-2.4.35.4/drivers/char/dz.h #endif /* DZ_SERIAL_H */ Index: linux-2.4.35.4/drivers/char/ibm_workpad_keymap.map =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/char/ibm_workpad_keymap.map 2007-12-15 05:19:44.922981052 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/char/ibm_workpad_keymap.map @@ -0,0 +1,343 @@ +# Keymap for IBM Workpad z50 +# US Mapping @@ -14342,8 +14342,8 @@ Index: linux-2.4.35.4/drivers/char/ibm_workpad_keymap.map + 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 2007-12-15 05:19:43.846919732 +0100 -+++ linux-2.4.35.4/drivers/char/indydog.c 2007-12-15 05:19:44.922981052 +0100 +--- linux-2.4.35.4.orig/drivers/char/indydog.c ++++ linux-2.4.35.4/drivers/char/indydog.c @@ -1,5 +1,5 @@ /* - * IndyDog 0.2 A Hardware Watchdog Device for SGI IP22 @@ -14380,7 +14380,7 @@ Index: linux-2.4.35.4/drivers/char/indydog.c #ifdef CONFIG_WATCHDOG_NOWAYOUT static int nowayout = 1; -@@ -33,10 +32,30 @@ +@@ -33,10 +32,30 @@ static int nowayout = 1; static int nowayout = 0; #endif @@ -14412,7 +14412,7 @@ Index: linux-2.4.35.4/drivers/char/indydog.c { sgimc->watchdogt = 0; } -@@ -46,18 +65,14 @@ +@@ -46,18 +65,14 @@ static inline void indydog_ping(void) */ static int indydog_open(struct inode *inode, struct file *file) { @@ -14434,7 +14434,7 @@ Index: linux-2.4.35.4/drivers/char/indydog.c indydog_ping(); indydog_alive = 1; -@@ -69,63 +84,48 @@ +@@ -69,63 +84,48 @@ static int indydog_open(struct inode *in static int indydog_release(struct inode *inode, struct file *file) { /* Shut off the timer. @@ -14514,7 +14514,7 @@ Index: linux-2.4.35.4/drivers/char/indydog.c return -EFAULT; return 0; case WDIOC_GETSTATUS: -@@ -134,31 +134,53 @@ +@@ -134,31 +134,53 @@ static int indydog_ioctl(struct inode *i case WDIOC_KEEPALIVE: indydog_ping(); return 0; @@ -14579,7 +14579,7 @@ Index: linux-2.4.35.4/drivers/char/indydog.c printk(banner); -@@ -172,4 +194,7 @@ +@@ -172,4 +194,7 @@ static void __exit watchdog_exit(void) module_init(watchdog_init); module_exit(watchdog_exit); @@ -14589,8 +14589,8 @@ Index: linux-2.4.35.4/drivers/char/indydog.c 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 2007-12-15 05:19:43.854920187 +0100 -+++ linux-2.4.35.4/drivers/char/ip27-rtc.c 2007-12-15 05:19:44.922981052 +0100 +--- linux-2.4.35.4.orig/drivers/char/ip27-rtc.c ++++ linux-2.4.35.4/drivers/char/ip27-rtc.c @@ -44,6 +44,7 @@ #include <asm/sn/klconfig.h> #include <asm/sn/sn0/ip27.h> @@ -14599,7 +14599,7 @@ Index: linux-2.4.35.4/drivers/char/ip27-rtc.c static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); -@@ -209,11 +210,8 @@ +@@ -209,11 +210,8 @@ static struct miscdevice rtc_dev= static int __init rtc_init(void) { @@ -14612,7 +14612,7 @@ Index: linux-2.4.35.4/drivers/char/ip27-rtc.c printk(KERN_INFO "Real Time Clock Driver v%s\n", RTC_VERSION); if (misc_register(&rtc_dev)) { -@@ -325,3 +323,7 @@ +@@ -325,3 +323,7 @@ static void get_rtc_time(struct rtc_time rtc_tm->tm_mon--; } @@ -14622,9 +14622,9 @@ Index: linux-2.4.35.4/drivers/char/ip27-rtc.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/char/Makefile =================================================================== ---- linux-2.4.35.4.orig/drivers/char/Makefile 2007-12-15 05:19:43.862920643 +0100 -+++ linux-2.4.35.4/drivers/char/Makefile 2007-12-15 05:19:44.922981052 +0100 -@@ -48,7 +48,12 @@ +--- linux-2.4.35.4.orig/drivers/char/Makefile ++++ linux-2.4.35.4/drivers/char/Makefile +@@ -48,7 +48,12 @@ ifeq ($(ARCH),mips) KEYBD = endif ifeq ($(CONFIG_VR41XX_KIU),y) @@ -14638,7 +14638,7 @@ Index: linux-2.4.35.4/drivers/char/Makefile KEYBD = vr41xx_keyb.o endif endif -@@ -251,7 +256,6 @@ +@@ -251,7 +256,6 @@ obj-$(CONFIG_MK712_MOUSE) += mk712.o obj-$(CONFIG_RTC) += rtc.o obj-$(CONFIG_GEN_RTC) += genrtc.o obj-$(CONFIG_EFI_RTC) += efirtc.o @@ -14646,7 +14646,7 @@ Index: linux-2.4.35.4/drivers/char/Makefile obj-$(CONFIG_MIPS_RTC) += mips_rtc.o obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o ifeq ($(CONFIG_PPC),) -@@ -259,6 +263,7 @@ +@@ -259,6 +263,7 @@ ifeq ($(CONFIG_PPC),) endif obj-$(CONFIG_TOSHIBA) += toshiba.o obj-$(CONFIG_I8K) += i8k.o @@ -14654,7 +14654,7 @@ Index: linux-2.4.35.4/drivers/char/Makefile obj-$(CONFIG_DS1620) += ds1620.o obj-$(CONFIG_DS1742) += ds1742.o obj-$(CONFIG_INTEL_RNG) += i810_rng.o -@@ -269,6 +274,7 @@ +@@ -269,6 +274,7 @@ obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o obj-$(CONFIG_ITE_GPIO) += ite_gpio.o obj-$(CONFIG_AU1X00_GPIO) += au1000_gpio.o @@ -14662,7 +14662,7 @@ Index: linux-2.4.35.4/drivers/char/Makefile obj-$(CONFIG_AU1X00_USB_TTY) += au1000_usbtty.o obj-$(CONFIG_AU1X00_USB_RAW) += au1000_usbraw.o obj-$(CONFIG_COBALT_LCD) += lcd.o -@@ -355,3 +361,9 @@ +@@ -355,3 +361,9 @@ defkeymap.c: defkeymap.map qtronixmap.c: qtronixmap.map set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@ @@ -14674,8 +14674,8 @@ Index: linux-2.4.35.4/drivers/char/Makefile + 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 2007-12-15 05:19:43.870921098 +0100 -+++ linux-2.4.35.4/drivers/char/mips_rtc.c 2007-12-15 05:19:44.926981281 +0100 +--- linux-2.4.35.4.orig/drivers/char/mips_rtc.c ++++ linux-2.4.35.4/drivers/char/mips_rtc.c @@ -53,14 +53,6 @@ #include <asm/io.h> #include <asm/uaccess.h> @@ -14693,9 +14693,9 @@ Index: linux-2.4.35.4/drivers/char/mips_rtc.c 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 2007-12-15 05:19:43.874921327 +0100 -+++ linux-2.4.35.4/drivers/char/sb1250_duart.c 2007-12-15 05:19:44.930981508 +0100 -@@ -328,10 +328,11 @@ +--- linux-2.4.35.4.orig/drivers/char/sb1250_duart.c ++++ linux-2.4.35.4/drivers/char/sb1250_duart.c +@@ -328,10 +328,11 @@ static int duart_write(struct tty_struct if (c <= 0) break; if (from_user) { @@ -14708,7 +14708,7 @@ Index: linux-2.4.35.4/drivers/char/sb1250_duart.c } else { memcpy(us->outp_buf + us->outp_tail, buf, c); } -@@ -498,9 +499,31 @@ +@@ -498,9 +499,31 @@ static void duart_set_termios(struct tty duart_set_cflag(us->line, tty->termios->c_cflag); } @@ -14740,7 +14740,7 @@ Index: linux-2.4.35.4/drivers/char/sb1250_duart.c /* if (serial_paranoia_check(info, tty->device, "rs_ioctl")) return -ENODEV;*/ switch (cmd) { -@@ -517,7 +540,7 @@ +@@ -517,7 +540,7 @@ static int duart_ioctl(struct tty_struct printk("Ignoring TIOCMSET\n"); break; case TIOCGSERIAL: @@ -14751,8 +14751,8 @@ Index: linux-2.4.35.4/drivers/char/sb1250_duart.c printk("Ignoring TIOCSSERIAL\n"); Index: linux-2.4.35.4/drivers/char/serial.c =================================================================== ---- linux-2.4.35.4.orig/drivers/char/serial.c 2007-12-15 05:19:43.882921783 +0100 -+++ linux-2.4.35.4/drivers/char/serial.c 2007-12-15 05:19:44.934981737 +0100 +--- linux-2.4.35.4.orig/drivers/char/serial.c ++++ linux-2.4.35.4/drivers/char/serial.c @@ -62,6 +62,12 @@ * Robert Schwebel <robert@schwebel.de>, * Juergen Beisert <jbeisert@eurodsn.de>, @@ -14766,7 +14766,7 @@ Index: linux-2.4.35.4/drivers/char/serial.c */ static char *serial_version = "5.05c"; -@@ -413,6 +419,22 @@ +@@ -413,6 +419,22 @@ static inline int serial_paranoia_check( return 0; } @@ -14789,7 +14789,7 @@ Index: linux-2.4.35.4/drivers/char/serial.c static _INLINE_ unsigned int serial_in(struct async_struct *info, int offset) { switch (info->io_type) { -@@ -447,6 +469,8 @@ +@@ -447,6 +469,8 @@ static _INLINE_ void serial_out(struct a outb(value, info->port+offset); } } @@ -14800,8 +14800,8 @@ Index: linux-2.4.35.4/drivers/char/serial.c * 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 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/char/victor_mpc30x_keymap.map 2007-12-15 05:19:44.934981737 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/char/victor_mpc30x_keymap.map @@ -0,0 +1,102 @@ +# Victor Interlink MP-C303/304 keyboard keymap +# @@ -14907,9 +14907,9 @@ Index: linux-2.4.35.4/drivers/char/victor_mpc30x_keymap.map + 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 2007-12-15 05:19:43.894922467 +0100 -+++ linux-2.4.35.4/drivers/char/vr41xx_keyb.c 2007-12-15 05:19:44.938981966 +0100 -@@ -308,7 +308,7 @@ +--- linux-2.4.35.4.orig/drivers/char/vr41xx_keyb.c ++++ linux-2.4.35.4/drivers/char/vr41xx_keyb.c +@@ -308,7 +308,7 @@ void __devinit kbd_init_hw(void) if (found != 0) { kiu_base = VRC4173_KIU_OFFSET; mkiuintreg = VRC4173_MKIUINTREG_OFFSET; @@ -14918,7 +14918,7 @@ Index: linux-2.4.35.4/drivers/char/vr41xx_keyb.c } } #endif -@@ -325,7 +325,7 @@ +@@ -325,7 +325,7 @@ void __devinit kbd_init_hw(void) if (current_cpu_data.cputype == CPU_VR4111 || current_cpu_data.cputype == CPU_VR4121) @@ -14929,9 +14929,9 @@ Index: linux-2.4.35.4/drivers/char/vr41xx_keyb.c Index: linux-2.4.35.4/drivers/i2c/Config.in =================================================================== ---- linux-2.4.35.4.orig/drivers/i2c/Config.in 2007-12-15 05:19:43.902922923 +0100 -+++ linux-2.4.35.4/drivers/i2c/Config.in 2007-12-15 05:19:44.938981966 +0100 -@@ -57,6 +57,10 @@ +--- linux-2.4.35.4.orig/drivers/i2c/Config.in ++++ linux-2.4.35.4/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 fi @@ -14944,8 +14944,8 @@ Index: linux-2.4.35.4/drivers/i2c/Config.in # 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 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/i2c/i2c-algo-au1550.c 2007-12-15 05:19:44.938981966 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/i2c/i2c-algo-au1550.c @@ -0,0 +1,340 @@ +/* + * i2c-algo-au1550.c: SMBus (i2c) driver algorithms for Alchemy PSC interface @@ -15289,8 +15289,8 @@ Index: linux-2.4.35.4/drivers/i2c/i2c-algo-au1550.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/i2c/i2c-au1550.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/i2c/i2c-au1550.c 2007-12-15 05:19:44.938981966 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/i2c/i2c-au1550.c @@ -0,0 +1,154 @@ +/* + * i2c-au1550.c: SMBus (i2c) adapter for Alchemy PSC interface @@ -15448,9 +15448,9 @@ Index: linux-2.4.35.4/drivers/i2c/i2c-au1550.c +} Index: linux-2.4.35.4/drivers/i2c/i2c-core.c =================================================================== ---- linux-2.4.35.4.orig/drivers/i2c/i2c-core.c 2007-12-15 05:19:43.922924062 +0100 -+++ linux-2.4.35.4/drivers/i2c/i2c-core.c 2007-12-15 05:19:44.938981966 +0100 -@@ -1277,6 +1277,9 @@ +--- linux-2.4.35.4.orig/drivers/i2c/i2c-core.c ++++ linux-2.4.35.4/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); #endif @@ -15460,7 +15460,7 @@ Index: linux-2.4.35.4/drivers/i2c/i2c-core.c #ifdef CONFIG_I2C_PROC extern int sensors_init(void); -@@ -1332,6 +1335,10 @@ +@@ -1332,6 +1335,10 @@ int __init i2c_init_all(void) i2c_max1617_init(); #endif @@ -15473,9 +15473,9 @@ Index: linux-2.4.35.4/drivers/i2c/i2c-core.c sensors_init(); Index: linux-2.4.35.4/drivers/i2c/Makefile =================================================================== ---- linux-2.4.35.4.orig/drivers/i2c/Makefile 2007-12-15 05:19:43.930924518 +0100 -+++ linux-2.4.35.4/drivers/i2c/Makefile 2007-12-15 05:19:44.942982192 +0100 -@@ -6,7 +6,7 @@ +--- linux-2.4.35.4.orig/drivers/i2c/Makefile ++++ linux-2.4.35.4/drivers/i2c/Makefile +@@ -6,7 +6,7 @@ O_TARGET := i2c.o export-objs := i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o \ i2c-algo-ite.o i2c-algo-sibyte.o i2c-algo-sgi.o \ @@ -15484,7 +15484,7 @@ Index: linux-2.4.35.4/drivers/i2c/Makefile obj-$(CONFIG_I2C) += i2c-core.o obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o -@@ -25,6 +25,7 @@ +@@ -25,6 +25,7 @@ obj-$(CONFIG_I2C_KEYWEST) += i2c-keywest obj-$(CONFIG_I2C_ALGO_SIBYTE) += i2c-algo-sibyte.o i2c-sibyte.o obj-$(CONFIG_I2C_MAX1617) += i2c-max1617.o obj-$(CONFIG_I2C_ALGO_SGI) += i2c-algo-sgi.o @@ -15494,9 +15494,9 @@ Index: linux-2.4.35.4/drivers/i2c/Makefile # 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 2007-12-15 05:19:43.934924747 +0100 -+++ linux-2.4.35.4/drivers/media/video/indycam.c 2007-12-15 05:19:44.942982192 +0100 -@@ -50,13 +50,14 @@ +--- linux-2.4.35.4.orig/drivers/media/video/indycam.c ++++ linux-2.4.35.4/drivers/media/video/indycam.c +@@ -50,13 +50,14 @@ static int indycam_attach(struct i2c_ada 0x80, /* INDYCAM_GAMMA */ }; @@ -15513,7 +15513,7 @@ Index: linux-2.4.35.4/drivers/media/video/indycam.c camera = kmalloc(sizeof(*camera), GFP_KERNEL); if (!camera) { err = -ENOMEM; -@@ -67,7 +68,7 @@ +@@ -67,7 +68,7 @@ static int indycam_attach(struct i2c_ada client->adapter = adap; client->addr = addr; client->driver = &i2c_driver_indycam; @@ -15522,7 +15522,7 @@ Index: linux-2.4.35.4/drivers/media/video/indycam.c camera->client = client; err = i2c_attach_client(client); -@@ -75,18 +76,18 @@ +@@ -75,18 +76,18 @@ static int indycam_attach(struct i2c_ada goto out_free_camera; camera->version = i2c_smbus_read_byte_data(client, INDYCAM_VERSION); @@ -15547,8 +15547,8 @@ Index: linux-2.4.35.4/drivers/media/video/indycam.c return 0; Index: linux-2.4.35.4/drivers/media/video/vino.c =================================================================== ---- linux-2.4.35.4.orig/drivers/media/video/vino.c 2007-12-15 05:19:43.946925431 +0100 -+++ linux-2.4.35.4/drivers/media/video/vino.c 2007-12-15 05:19:44.950982647 +0100 +--- linux-2.4.35.4.orig/drivers/media/video/vino.c ++++ linux-2.4.35.4/drivers/media/video/vino.c @@ -5,6 +5,8 @@ * License version 2 as published by the Free Software Foundation. * @@ -15583,7 +15583,7 @@ Index: linux-2.4.35.4/drivers/media/video/vino.c #define VINO_MIN_WIDTH 32 #define VINO_MIN_HEIGHT 32 -@@ -64,9 +76,7 @@ +@@ -64,9 +76,7 @@ static int threshold_b = 512; struct vino_device { struct video_device vdev; @@ -15594,7 +15594,7 @@ Index: linux-2.4.35.4/drivers/media/video/vino.c int alpha; /* clipping... */ unsigned int left, right, top, bottom; -@@ -106,7 +116,7 @@ +@@ -106,7 +116,7 @@ struct vino_device { struct vino_client { struct i2c_client *driver; @@ -15603,7 +15603,7 @@ Index: linux-2.4.35.4/drivers/media/video/vino.c }; struct vino_video { -@@ -362,6 +372,7 @@ +@@ -362,6 +372,7 @@ static int set_scaling(struct vino_devic static int dma_setup(struct vino_device *v) { u32 ctrl, intr; @@ -15611,7 +15611,7 @@ Index: linux-2.4.35.4/drivers/media/video/vino.c struct sgi_vino_channel *ch; ch = (v->chan == VINO_CHAN_A) ? &vino->a : &vino->b; -@@ -377,14 +388,24 @@ +@@ -377,14 +388,24 @@ static int dma_setup(struct vino_device ch->line_size = v->line_size - 8; /* set the alpha register */ ch->alpha = v->alpha; @@ -15642,7 +15642,7 @@ Index: linux-2.4.35.4/drivers/media/video/vino.c /* init the frame rate and norm (full frame rate only for now...) */ ch->frame_rate = VINO_FRAMERT_RT(0x1fff) | (get_capture_norm(v) == VIDEO_MODE_PAL ? -@@ -510,6 +531,7 @@ +@@ -510,6 +531,7 @@ static void field_done(struct vino_devic static void vino_interrupt(int irq, void *dev_id, struct pt_regs *regs) { u32 intr, ctrl; @@ -15650,7 +15650,7 @@ Index: linux-2.4.35.4/drivers/media/video/vino.c spin_lock(&Vino->vino_lock); ctrl = vino->control; -@@ -525,12 +547,14 @@ +@@ -525,12 +547,14 @@ static void vino_interrupt(int irq, void vino->control = ctrl; clear_eod(&Vino->chB); } @@ -15671,9 +15671,9 @@ Index: linux-2.4.35.4/drivers/media/video/vino.c 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 2007-12-15 05:19:43.954925886 +0100 -+++ linux-2.4.35.4/drivers/mtd/devices/docprobe.c 2007-12-15 05:19:44.950982647 +0100 -@@ -89,10 +89,10 @@ +--- linux-2.4.35.4.orig/drivers/mtd/devices/docprobe.c ++++ linux-2.4.35.4/drivers/mtd/devices/docprobe.c +@@ -89,10 +89,10 @@ static unsigned long __initdata doc_loca 0xe4000000, #elif defined(CONFIG_MOMENCO_OCELOT) 0x2f000000, @@ -15689,8 +15689,8 @@ Index: linux-2.4.35.4/drivers/mtd/devices/docprobe.c 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 2007-12-15 05:19:43.958926116 +0100 -+++ linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c 2007-12-15 05:19:44.950982647 +0100 +--- linux-2.4.35.4.orig/drivers/mtd/devices/ms02-nv.c ++++ linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c @@ -1,10 +1,10 @@ /* - * Copyright (c) 2001 Maciej W. Rozycki @@ -15731,7 +15731,7 @@ Index: linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c */ static ulong ms02nv_addrs[] __initdata = { 0x07000000, 0x06800000, 0x06000000, 0x05800000, 0x05000000, -@@ -130,7 +130,7 @@ +@@ -130,7 +130,7 @@ static int __init ms02nv_init_one(ulong int ret = -ENODEV; @@ -15740,7 +15740,7 @@ Index: linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c mod_res = kmalloc(sizeof(*mod_res), GFP_KERNEL); if (!mod_res) return -ENOMEM; -@@ -233,7 +233,7 @@ +@@ -233,7 +233,7 @@ static int __init ms02nv_init_one(ulong goto err_out_csr_res; } @@ -15749,7 +15749,7 @@ Index: linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c mtd->index, ms02nv_name, addr, size >> 20); mp->next = root_ms02nv_mtd; -@@ -293,12 +293,12 @@ +@@ -293,12 +293,12 @@ static int __init ms02nv_init(void) switch (mips_machtype) { case MACH_DS5000_200: @@ -15766,8 +15766,8 @@ Index: linux-2.4.35.4/drivers/mtd/devices/ms02-nv.c 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 2007-12-15 05:19:43.966926571 +0100 -+++ linux-2.4.35.4/drivers/mtd/devices/ms02-nv.h 2007-12-15 05:19:44.950982647 +0100 +--- linux-2.4.35.4.orig/drivers/mtd/devices/ms02-nv.h ++++ linux-2.4.35.4/drivers/mtd/devices/ms02-nv.h @@ -1,32 +1,96 @@ /* - * Copyright (c) 2001 Maciej W. Rozycki @@ -15876,9 +15876,9 @@ Index: linux-2.4.35.4/drivers/mtd/devices/ms02-nv.h 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 2007-12-15 05:19:43.974927026 +0100 -+++ linux-2.4.35.4/drivers/mtd/maps/Config.in 2007-12-15 05:19:44.950982647 +0100 -@@ -51,11 +51,26 @@ +--- linux-2.4.35.4.orig/drivers/mtd/maps/Config.in ++++ linux-2.4.35.4/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 ' Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100 @@ -15907,8 +15907,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/Config.in 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 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/mtd/maps/db1x00-flash.c 2007-12-15 05:19:44.950982647 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/mtd/maps/db1x00-flash.c @@ -0,0 +1,283 @@ +/* + * Flash memory access on Alchemy Db1xxx boards @@ -16195,8 +16195,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/db1x00-flash.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/mtd/maps/hydrogen3-flash.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/mtd/maps/hydrogen3-flash.c 2007-12-15 05:19:44.954982876 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/mtd/maps/hydrogen3-flash.c @@ -0,0 +1,189 @@ +/* + * Flash memory access on Alchemy HydrogenIII boards @@ -16389,8 +16389,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/hydrogen3-flash.c +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 2007-12-15 05:19:43.994928166 +0100 -+++ linux-2.4.35.4/drivers/mtd/maps/lasat.c 2007-12-15 05:19:44.954982876 +0100 +--- linux-2.4.35.4.orig/drivers/mtd/maps/lasat.c ++++ linux-2.4.35.4/drivers/mtd/maps/lasat.c @@ -1,15 +1,6 @@ /* * Flash device on lasat 100 and 200 boards @@ -16415,7 +16415,7 @@ Index: linux-2.4.35.4/drivers/mtd/maps/lasat.c static struct mtd_info *mymtd; -@@ -69,30 +59,33 @@ +@@ -69,30 +59,33 @@ static void sp_copy_to(struct map_info * } static struct map_info sp_map = { @@ -16461,7 +16461,7 @@ Index: linux-2.4.35.4/drivers/mtd/maps/lasat.c sp_map.size = lasat_board_info.li_flash_size; printk(KERN_NOTICE "sp flash device: %lx at %lx\n", -@@ -109,12 +102,15 @@ +@@ -109,12 +102,15 @@ static int __init init_sp(void) for (i=0; i < LASAT_MTD_LAST; i++) { size = lasat_flash_partition_size(i); @@ -16481,7 +16481,7 @@ Index: linux-2.4.35.4/drivers/mtd/maps/lasat.c return 0; } -@@ -124,11 +120,11 @@ +@@ -124,11 +120,11 @@ static int __init init_sp(void) static void __exit cleanup_sp(void) { if (mymtd) { @@ -16498,9 +16498,9 @@ Index: linux-2.4.35.4/drivers/mtd/maps/lasat.c Index: linux-2.4.35.4/drivers/mtd/maps/Makefile =================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/maps/Makefile 2007-12-15 05:19:43.998928395 +0100 -+++ linux-2.4.35.4/drivers/mtd/maps/Makefile 2007-12-15 05:19:44.954982876 +0100 -@@ -52,7 +52,13 @@ +--- linux-2.4.35.4.orig/drivers/mtd/maps/Makefile ++++ linux-2.4.35.4/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_PB1500) += pb1xxx-flash.o @@ -16514,7 +16514,7 @@ Index: linux-2.4.35.4/drivers/mtd/maps/Makefile obj-$(CONFIG_MTD_AUTCPU12) += autcpu12-nvram.o obj-$(CONFIG_MTD_EDB7312) += edb7312.o obj-$(CONFIG_MTD_IMPA7) += impa7.o -@@ -61,5 +67,6 @@ +@@ -61,5 +67,6 @@ obj-$(CONFIG_MTD_REDWOOD) += redwood.o obj-$(CONFIG_MTD_UCLINUX) += uclinux.o obj-$(CONFIG_MTD_NETtel) += nettel.o obj-$(CONFIG_MTD_SCB2_FLASH) += scb2_flash.o @@ -16523,8 +16523,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/Makefile include $(TOPDIR)/Rules.make Index: linux-2.4.35.4/drivers/mtd/maps/mirage-flash.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/mtd/maps/mirage-flash.c 2007-12-15 05:19:44.954982876 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/mtd/maps/mirage-flash.c @@ -0,0 +1,194 @@ +/* + * Flash memory access on AMD Mirage board. @@ -16722,8 +16722,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/mirage-flash.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/mtd/maps/mtx-1.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/mtd/maps/mtx-1.c 2007-12-15 05:19:44.954982876 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/mtd/maps/mtx-1.c @@ -0,0 +1,181 @@ +/* + * Flash memory access on 4G Systems MTX-1 board @@ -16908,8 +16908,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/mtx-1.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/mtd/maps/pb1550-flash.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/mtd/maps/pb1550-flash.c 2007-12-15 05:19:44.958983106 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/mtd/maps/pb1550-flash.c @@ -0,0 +1,270 @@ +/* + * Flash memory access on Alchemy Pb1550 board @@ -17183,9 +17183,9 @@ Index: linux-2.4.35.4/drivers/mtd/maps/pb1550-flash.c +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 2007-12-15 05:19:44.026929991 +0100 -+++ linux-2.4.35.4/drivers/mtd/maps/pb1xxx-flash.c 2007-12-15 05:19:44.958983106 +0100 -@@ -192,6 +192,34 @@ +--- linux-2.4.35.4.orig/drivers/mtd/maps/pb1xxx-flash.c ++++ linux-2.4.35.4/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 */ #endif @@ -17222,8 +17222,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/pb1xxx-flash.c #endif Index: linux-2.4.35.4/drivers/mtd/maps/xxs1500.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/mtd/maps/xxs1500.c 2007-12-15 05:19:44.958983106 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/mtd/maps/xxs1500.c @@ -0,0 +1,186 @@ +/* + * Flash memory access on MyCable XXS1500 board @@ -17413,8 +17413,8 @@ Index: linux-2.4.35.4/drivers/mtd/maps/xxs1500.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/net/defxx.c =================================================================== ---- linux-2.4.35.4.orig/drivers/net/defxx.c 2007-12-15 05:19:44.042930901 +0100 -+++ linux-2.4.35.4/drivers/net/defxx.c 2007-12-15 05:19:44.962983332 +0100 +--- linux-2.4.35.4.orig/drivers/net/defxx.c ++++ linux-2.4.35.4/drivers/net/defxx.c @@ -10,24 +10,18 @@ * * Abstract: @@ -17507,7 +17507,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c #define DYNAMIC_BUFFERS 1 -@@ -243,7 +251,7 @@ +@@ -243,7 +251,7 @@ static char version[] __devinitdata = static void dfx_bus_init(struct net_device *dev); static void dfx_bus_config_check(DFX_board_t *bp); @@ -17516,7 +17516,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c static int dfx_adap_init(DFX_board_t *bp, int get_buffers); static int dfx_open(struct net_device *dev); -@@ -337,48 +345,84 @@ +@@ -337,48 +345,84 @@ static inline void dfx_port_write_byte( int offset, u8 data ) @@ -17601,7 +17601,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c /* -@@ -393,8 +437,9 @@ +@@ -393,8 +437,9 @@ static inline void dfx_port_read_long( * Condition code * * Arguments: @@ -17613,7 +17613,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c * * Functional Description: * -@@ -410,54 +455,68 @@ +@@ -410,54 +455,68 @@ static inline void dfx_port_read_long( * initialized and the board resources are read and stored in * the device structure. */ @@ -17701,7 +17701,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c dev->get_stats = dfx_ctl_get_stats; dev->open = dfx_open; dev->stop = dfx_close; -@@ -465,37 +524,54 @@ +@@ -465,37 +524,54 @@ static int __devinit dfx_init_one_pci_or dev->set_multicast_list = dfx_ctl_set_multicast_list; dev->set_mac_address = dfx_ctl_set_mac_address; @@ -17765,7 +17765,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c } static int __init dfx_eisa_init(void) -@@ -507,6 +583,7 @@ +@@ -507,6 +583,7 @@ static int __init dfx_eisa_init(void) DBG_printk("In dfx_eisa_init...\n"); @@ -17773,7 +17773,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c /* Scan for FDDI EISA controllers */ for (i=0; i < DFX_MAX_EISA_SLOTS; i++) /* only scan for up to 16 EISA slots */ -@@ -517,9 +594,27 @@ +@@ -517,9 +594,27 @@ static int __init dfx_eisa_init(void) { port = (i << 12); /* recalc base addr */ @@ -17802,7 +17802,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c return rc; } -@@ -583,8 +678,9 @@ +@@ -583,8 +678,9 @@ static void __devinit dfx_bus_init(struc /* Initialize adapter based on bus type */ @@ -17814,7 +17814,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c /* Get the interrupt level from the ESIC chip */ dfx_port_read_byte(bp, PI_ESIC_K_IO_CONFIG_STAT_0, &val); -@@ -766,6 +862,7 @@ +@@ -766,6 +862,7 @@ static void __devinit dfx_bus_config_che * * Arguments: * dev - pointer to device information @@ -17822,7 +17822,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c * * Functional Description: * This function allocates additional resources such as the host memory -@@ -780,20 +877,21 @@ +@@ -780,20 +877,21 @@ static void __devinit dfx_bus_config_che * or read adapter MAC address * * Assumptions: @@ -17848,7 +17848,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c u32 data; /* host data register value */ DBG_printk("In dfx_driver_init...\n"); -@@ -837,26 +935,20 @@ +@@ -837,26 +935,20 @@ static int __devinit dfx_driver_init(str /* Read the factory MAC address from the adapter then save it */ @@ -17885,7 +17885,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c memcpy(&bp->factory_mac_addr[4], &data, sizeof(u16)); /* -@@ -867,28 +959,27 @@ +@@ -867,28 +959,27 @@ static int __devinit dfx_driver_init(str */ memcpy(dev->dev_addr, bp->factory_mac_addr, FDDI_K_ALEN); @@ -17934,7 +17934,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c /* * Get memory for descriptor block, consumer block, and other buffers -@@ -903,14 +994,15 @@ +@@ -903,14 +994,15 @@ static int __devinit dfx_driver_init(str #endif sizeof(PI_CONSUMER_BLOCK) + (PI_ALIGN_K_DESC_BLK - 1); @@ -17956,7 +17956,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c /* * To guarantee the 8K alignment required for the descriptor block, 8K - 1 -@@ -924,7 +1016,7 @@ +@@ -924,7 +1016,7 @@ static int __devinit dfx_driver_init(str * for allocating the needed memory. */ @@ -17965,7 +17965,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c curr_v = top_v + (curr_p - top_p); /* Reserve space for descriptor block */ -@@ -965,14 +1057,20 @@ +@@ -965,14 +1057,20 @@ static int __devinit dfx_driver_init(str /* Display virtual and physical addresses if debug driver */ @@ -17992,7 +17992,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c /* -@@ -1218,7 +1316,9 @@ +@@ -1218,7 +1316,9 @@ static int dfx_open(struct net_device *d /* Register IRQ - support shared interrupts by passing device ptr */ @@ -18003,7 +18003,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c if (ret) { printk(KERN_ERR "%s: Requested IRQ %d is busy\n", dev->name, dev->irq); return ret; -@@ -1737,7 +1837,7 @@ +@@ -1737,7 +1837,7 @@ static void dfx_interrupt(int irq, void dfx_port_write_long(bp, PFI_K_REG_MODE_CTRL, (PFI_MODE_M_PDQ_INT_ENB + PFI_MODE_M_DMA_ENB)); } @@ -18012,7 +18012,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c { /* Disable interrupts at the ESIC */ -@@ -1755,6 +1855,13 @@ +@@ -1755,6 +1855,13 @@ static void dfx_interrupt(int irq, void tmp |= PI_CONFIG_STAT_0_M_INT_ENB; dfx_port_write_byte(bp, PI_ESIC_K_IO_CONFIG_STAT_0, tmp); } @@ -18026,7 +18026,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c spin_unlock(&bp->lock); } -@@ -2663,12 +2770,12 @@ +@@ -2663,12 +2770,12 @@ static int dfx_hw_dma_uninit(DFX_board_t static void my_skb_align(struct sk_buff *skb, int n) { @@ -18043,7 +18043,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c } -@@ -2745,7 +2852,10 @@ +@@ -2745,7 +2852,10 @@ static int dfx_rcv_init(DFX_board_t *bp, */ my_skb_align(newskb, 128); @@ -18055,7 +18055,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c /* * p_rcv_buff_va is only used inside the * kernel so we put the skb pointer here. -@@ -2859,9 +2969,17 @@ +@@ -2859,9 +2969,17 @@ static void dfx_rcv_queue_process( my_skb_align(newskb, 128); skb = (struct sk_buff *)bp->p_rcv_buff_va[entry]; @@ -18074,7 +18074,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c } else skb = NULL; } else -@@ -2934,7 +3052,7 @@ +@@ -2934,7 +3052,7 @@ static void dfx_rcv_queue_process( * is contained in a single physically contiguous buffer * in which the virtual address of the start of packet * (skb->data) can be converted to a physical address @@ -18083,7 +18083,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c * * Since the adapter architecture requires a three byte * packet request header to prepend the start of packet, -@@ -3082,12 +3200,13 @@ +@@ -3082,12 +3200,13 @@ static int dfx_xmt_queue_pkt( * skb->data. * 6. The physical address of the start of packet * can be determined from the virtual address @@ -18099,7 +18099,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c /* * Verify that descriptor is actually available -@@ -3171,6 +3290,7 @@ +@@ -3171,6 +3290,7 @@ static int dfx_xmt_done(DFX_board_t *bp) { XMT_DRIVER_DESCR *p_xmt_drv_descr; /* ptr to transmit driver descriptor */ PI_TYPE_2_CONSUMER *p_type_2_cons; /* ptr to rcv/xmt consumer block register */ @@ -18107,7 +18107,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c int freed = 0; /* buffers freed */ /* Service all consumed transmit frames */ -@@ -3188,7 +3308,11 @@ +@@ -3188,7 +3308,11 @@ static int dfx_xmt_done(DFX_board_t *bp) bp->xmt_total_bytes += p_xmt_drv_descr->p_skb->len; /* Return skb to operating system */ @@ -18120,7 +18120,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c dev_kfree_skb_irq(p_xmt_drv_descr->p_skb); /* -@@ -3297,6 +3421,7 @@ +@@ -3297,6 +3421,7 @@ static void dfx_xmt_flush( DFX_board_t * { u32 prod_cons; /* rcv/xmt consumer block longword */ XMT_DRIVER_DESCR *p_xmt_drv_descr; /* ptr to transmit driver descriptor */ @@ -18128,7 +18128,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c /* Flush all outstanding transmit frames */ -@@ -3307,7 +3432,11 @@ +@@ -3307,7 +3432,11 @@ static void dfx_xmt_flush( DFX_board_t * p_xmt_drv_descr = &(bp->xmt_drv_descr_blk[bp->rcv_xmt_reg.index.xmt_comp]); /* Return skb to operating system */ @@ -18141,7 +18141,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c dev_kfree_skb(p_xmt_drv_descr->p_skb); /* Increment transmit error counter */ -@@ -3337,12 +3466,36 @@ +@@ -3337,12 +3466,36 @@ static void dfx_xmt_flush( DFX_board_t * static void __devexit dfx_remove_one_pci_or_eisa(struct pci_dev *pdev, struct net_device *dev) { @@ -18182,7 +18182,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c } static void __devexit dfx_remove_one (struct pci_dev *pdev) -@@ -3353,21 +3506,22 @@ +@@ -3353,21 +3506,22 @@ static void __devexit dfx_remove_one (st pci_set_drvdata(pdev, NULL); } @@ -18210,7 +18210,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c static void __exit dfx_eisa_cleanup(void) -@@ -3388,12 +3542,7 @@ +@@ -3388,12 +3542,7 @@ static void __exit dfx_eisa_cleanup(void static int __init dfx_init(void) { @@ -18224,7 +18224,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.c rc_pci = pci_module_init(&dfx_driver); if (rc_pci >= 0) dfx_have_pci = 1; -@@ -3401,20 +3550,27 @@ +@@ -3401,20 +3550,27 @@ static int __init dfx_init(void) rc_eisa = dfx_eisa_init(); if (rc_eisa >= 0) dfx_have_eisa = 1; @@ -18257,8 +18257,8 @@ Index: linux-2.4.35.4/drivers/net/defxx.c Index: linux-2.4.35.4/drivers/net/defxx.h =================================================================== ---- linux-2.4.35.4.orig/drivers/net/defxx.h 2007-12-15 05:19:44.050931357 +0100 -+++ linux-2.4.35.4/drivers/net/defxx.h 2007-12-15 05:19:44.962983332 +0100 +--- linux-2.4.35.4.orig/drivers/net/defxx.h ++++ linux-2.4.35.4/drivers/net/defxx.h @@ -12,17 +12,11 @@ * Contains all definitions specified by port specification and required * by the defxx.c driver. @@ -18289,7 +18289,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.h */ #ifndef _DEFXX_H_ -@@ -1467,6 +1462,11 @@ +@@ -1467,6 +1462,11 @@ typedef union #endif /* #ifndef BIG_ENDIAN */ @@ -18301,7 +18301,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.h /* Define EISA controller register offsets */ #define PI_ESIC_K_BURST_HOLDOFF 0x040 -@@ -1634,6 +1634,7 @@ +@@ -1634,6 +1634,7 @@ typedef union #define DFX_BUS_TYPE_PCI 0 /* type code for DEC FDDIcontroller/PCI */ #define DFX_BUS_TYPE_EISA 1 /* type code for DEC FDDIcontroller/EISA */ @@ -18309,7 +18309,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.h #define DFX_FC_PRH2_PRH1_PRH0 0x54003820 /* Packet Request Header bytes + FC */ #define DFX_PRH0_BYTE 0x20 /* Packet Request Header byte 0 */ -@@ -1704,17 +1705,19 @@ +@@ -1704,17 +1705,19 @@ typedef struct DFX_board_tag { /* Keep virtual and physical pointers to locked, physically contiguous memory */ @@ -18335,7 +18335,7 @@ Index: linux-2.4.35.4/drivers/net/defxx.h /* Keep local copies of Type 1 and Type 2 register data */ -@@ -1758,8 +1761,9 @@ +@@ -1758,8 +1761,9 @@ typedef struct DFX_board_tag struct net_device *dev; /* pointer to device structure */ struct net_device *next; @@ -18349,9 +18349,9 @@ Index: linux-2.4.35.4/drivers/net/defxx.h 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 2007-12-15 05:19:44.058931815 +0100 -+++ linux-2.4.35.4/drivers/net/hamradio/hdlcdrv.c 2007-12-15 05:19:44.962983332 +0100 -@@ -587,6 +587,8 @@ +--- linux-2.4.35.4.orig/drivers/net/hamradio/hdlcdrv.c ++++ linux-2.4.35.4/drivers/net/hamradio/hdlcdrv.c +@@ -587,6 +587,8 @@ static int hdlcdrv_close(struct net_devi return -EINVAL; s = (struct hdlcdrv_state *)dev->priv; @@ -18362,9 +18362,9 @@ Index: linux-2.4.35.4/drivers/net/hamradio/hdlcdrv.c 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 2007-12-15 05:19:44.066932270 +0100 -+++ linux-2.4.35.4/drivers/net/irda/au1k_ir.c 2007-12-15 05:19:44.966983561 +0100 -@@ -81,10 +81,6 @@ +--- linux-2.4.35.4.orig/drivers/net/irda/au1k_ir.c ++++ linux-2.4.35.4/drivers/net/irda/au1k_ir.c +@@ -81,10 +81,6 @@ static char version[] __devinitdata = #define RUN_AT(x) (jiffies + (x)) @@ -18377,8 +18377,8 @@ Index: linux-2.4.35.4/drivers/net/irda/au1k_ir.c /* Index: linux-2.4.35.4/drivers/net/sgiseeq.c =================================================================== ---- linux-2.4.35.4.orig/drivers/net/sgiseeq.c 2007-12-15 05:19:44.074932725 +0100 -+++ linux-2.4.35.4/drivers/net/sgiseeq.c 2007-12-15 05:19:44.966983561 +0100 +--- linux-2.4.35.4.orig/drivers/net/sgiseeq.c ++++ linux-2.4.35.4/drivers/net/sgiseeq.c @@ -24,16 +24,16 @@ #include <asm/io.h> #include <asm/system.h> @@ -18398,7 +18398,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c static char *sgiseeqstr = "SGI Seeq8003"; /* -@@ -113,9 +113,9 @@ +@@ -113,9 +113,9 @@ static struct net_device *root_sgiseeq_d static inline void hpc3_eth_reset(struct hpc3_ethregs *hregs) { @@ -18410,7 +18410,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c } static inline void reset_hpc3_and_seeq(struct hpc3_ethregs *hregs, -@@ -238,7 +238,6 @@ +@@ -238,7 +238,6 @@ void sgiseeq_dump_rings(void) #define TSTAT_INIT_SEEQ (SEEQ_TCMD_IPT|SEEQ_TCMD_I16|SEEQ_TCMD_IC|SEEQ_TCMD_IUF) #define TSTAT_INIT_EDLC ((TSTAT_INIT_SEEQ) | SEEQ_TCMD_RB2) @@ -18418,7 +18418,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c static int init_seeq(struct net_device *dev, struct sgiseeq_private *sp, struct sgiseeq_regs *sregs) -@@ -260,8 +259,6 @@ +@@ -260,8 +259,6 @@ static int init_seeq(struct net_device * sregs->tstat = TSTAT_INIT_SEEQ; } @@ -18427,7 +18427,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c hregs->rx_ndptr = PHYSADDR(&sp->srings.rx_desc[0]); hregs->tx_ndptr = PHYSADDR(&sp->srings.tx_desc[0]); -@@ -432,7 +429,7 @@ +@@ -432,7 +429,7 @@ static void sgiseeq_interrupt(int irq, v spin_lock(&sp->tx_lock); /* Ack the IRQ and set software state. */ @@ -18436,7 +18436,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c /* Always check for received packets. */ sgiseeq_rx(dev, sp, hregs, sregs); -@@ -616,7 +613,7 @@ +@@ -616,7 +613,7 @@ static inline void setup_rx_ring(struct #define ALIGNED(x) ((((unsigned long)(x)) + 0xf) & ~(0xf)) @@ -18445,7 +18445,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c { struct net_device *dev; struct sgiseeq_private *sp; -@@ -629,7 +626,7 @@ +@@ -629,7 +626,7 @@ int sgiseeq_init(struct hpc3_regs* regs, goto err_out; } /* Make private data page aligned */ @@ -18454,7 +18454,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c if (!sp) { printk(KERN_ERR "Sgiseeq: Page alloc failed, aborting.\n"); err = -ENOMEM; -@@ -644,7 +641,9 @@ +@@ -644,7 +641,9 @@ int sgiseeq_init(struct hpc3_regs* regs, #define EADDR_NVOFS 250 for (i = 0; i < 3; i++) { @@ -18465,7 +18465,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c dev->dev_addr[2 * i] = tmp >> 8; dev->dev_addr[2 * i + 1] = tmp & 0xff; -@@ -654,8 +653,8 @@ +@@ -654,8 +653,8 @@ int sgiseeq_init(struct hpc3_regs* regs, gpriv = sp; gdev = dev; #endif @@ -18476,7 +18476,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c sp->name = sgiseeqstr; sp->mode = SEEQ_RCMD_RBCAST; -@@ -672,6 +671,11 @@ +@@ -672,6 +671,11 @@ int sgiseeq_init(struct hpc3_regs* regs, setup_rx_ring(sp->srings.rx_desc, SEEQ_RX_BUFFERS); setup_tx_ring(sp->srings.tx_desc, SEEQ_TX_BUFFERS); @@ -18488,7 +18488,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c /* Reset the chip. */ hpc3_eth_reset(sp->hregs); -@@ -699,7 +703,7 @@ +@@ -699,7 +703,7 @@ int sgiseeq_init(struct hpc3_regs* regs, goto err_out_free_irq; } @@ -18497,7 +18497,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c for (i = 0; i < 6; i++) printk("%2.2x%c", dev->dev_addr[i], i == 5 ? '\n' : ':'); -@@ -721,10 +725,22 @@ +@@ -721,10 +725,22 @@ err_out: static int __init sgiseeq_probe(void) { @@ -18522,7 +18522,7 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c } static void __exit sgiseeq_exit(void) -@@ -747,4 +763,6 @@ +@@ -747,4 +763,6 @@ static void __exit sgiseeq_exit(void) module_init(sgiseeq_probe); module_exit(sgiseeq_exit); @@ -18531,9 +18531,9 @@ Index: linux-2.4.35.4/drivers/net/sgiseeq.c MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/drivers/pci/pci.c =================================================================== ---- linux-2.4.35.4.orig/drivers/pci/pci.c 2007-12-15 05:19:44.082933181 +0100 -+++ linux-2.4.35.4/drivers/pci/pci.c 2007-12-15 05:19:44.966983561 +0100 -@@ -1281,11 +1281,17 @@ +--- linux-2.4.35.4.orig/drivers/pci/pci.c ++++ linux-2.4.35.4/drivers/pci/pci.c +@@ -1281,11 +1281,17 @@ static int __devinit pci_scan_bridge(str { unsigned int buses; unsigned short cr; @@ -18551,7 +18551,7 @@ Index: linux-2.4.35.4/drivers/pci/pci.c if ((buses & 0xffff00) && !pcibios_assign_all_busses()) { /* * Bus already configured by firmware, process it in the first -@@ -1351,6 +1357,7 @@ +@@ -1351,6 +1357,7 @@ static int __devinit pci_scan_bridge(str pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, max); pci_write_config_word(dev, PCI_COMMAND, cr); } @@ -18561,8 +18561,8 @@ Index: linux-2.4.35.4/drivers/pci/pci.c } Index: linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c =================================================================== ---- linux-2.4.35.4.orig/drivers/pcmcia/au1000_db1x00.c 2007-12-15 05:19:44.090933636 +0100 -+++ linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c 2007-12-15 05:19:44.970983787 +0100 +--- linux-2.4.35.4.orig/drivers/pcmcia/au1000_db1x00.c ++++ linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c @@ -1,6 +1,6 @@ /* * @@ -18593,7 +18593,7 @@ Index: linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c static int db1x00_pcmcia_init(struct pcmcia_init *init) { -@@ -76,7 +87,7 @@ +@@ -76,7 +87,7 @@ static int db1x00_pcmcia_socket_state(unsigned sock, struct pcmcia_state *state) { u32 inserted; @@ -18602,7 +18602,7 @@ Index: linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c if(sock > PCMCIA_MAX_SOCK) return -1; -@@ -87,11 +98,11 @@ +@@ -87,11 +98,11 @@ db1x00_pcmcia_socket_state(unsigned sock if (sock == 0) { vs = bcsr->status & 0x3; @@ -18616,7 +18616,7 @@ Index: linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c } DEBUG(KERN_DEBUG "db1x00 socket %d: inserted %d, vs %d\n", -@@ -144,16 +155,9 @@ +@@ -144,16 +155,9 @@ static int db1x00_pcmcia_get_irq_info(st if(info->sock > PCMCIA_MAX_SOCK) return -1; if(info->sock == 0) @@ -18637,9 +18637,9 @@ Index: linux-2.4.35.4/drivers/pcmcia/au1000_db1x00.c Index: linux-2.4.35.4/drivers/pcmcia/Config.in =================================================================== ---- linux-2.4.35.4.orig/drivers/pcmcia/Config.in 2007-12-15 05:19:44.098934094 +0100 -+++ linux-2.4.35.4/drivers/pcmcia/Config.in 2007-12-15 05:19:44.974984016 +0100 -@@ -30,16 +30,14 @@ +--- linux-2.4.35.4.orig/drivers/pcmcia/Config.in ++++ linux-2.4.35.4/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_SOC_AU1X00" = "y" ]; then @@ -18662,9 +18662,9 @@ Index: linux-2.4.35.4/drivers/pcmcia/Config.in fi Index: linux-2.4.35.4/drivers/pcmcia/Makefile =================================================================== ---- linux-2.4.35.4.orig/drivers/pcmcia/Makefile 2007-12-15 05:19:44.106934550 +0100 -+++ linux-2.4.35.4/drivers/pcmcia/Makefile 2007-12-15 05:19:44.974984016 +0100 -@@ -61,9 +61,18 @@ +--- linux-2.4.35.4.orig/drivers/pcmcia/Makefile ++++ linux-2.4.35.4/drivers/pcmcia/Makefile +@@ -61,9 +61,18 @@ endif obj-$(CONFIG_PCMCIA_AU1X00) += au1x00_ss.o au1000_ss-objs-y := au1000_generic.o @@ -18686,7 +18686,7 @@ Index: linux-2.4.35.4/drivers/pcmcia/Makefile obj-$(CONFIG_PCMCIA_SA1100) += sa1100_cs.o obj-$(CONFIG_PCMCIA_M8XX) += m8xx_pcmcia.o -@@ -89,6 +98,7 @@ +@@ -89,6 +98,7 @@ sa1100_cs-objs-$(CONFIG_SA1100_STORK) + sa1100_cs-objs-$(CONFIG_SA1100_XP860) += sa1100_xp860.o sa1111_generic.o sa1100_cs-objs-$(CONFIG_SA1100_YOPY) += sa1100_yopy.o @@ -18696,8 +18696,8 @@ Index: linux-2.4.35.4/drivers/pcmcia/Makefile include $(TOPDIR)/Rules.make Index: linux-2.4.35.4/drivers/pcmcia/vrc4171_card.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/pcmcia/vrc4171_card.c 2007-12-15 05:19:44.978984245 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/pcmcia/vrc4171_card.c @@ -0,0 +1,886 @@ +/* + * vrc4171_card.c, NEC VRC4171 Card Controller driver for Socket Services. @@ -19587,8 +19587,8 @@ Index: linux-2.4.35.4/drivers/pcmcia/vrc4171_card.c +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 2007-12-15 05:19:44.122935460 +0100 -+++ linux-2.4.35.4/drivers/scsi/NCR53C9x.h 2007-12-15 05:19:44.978984245 +0100 +--- linux-2.4.35.4.orig/drivers/scsi/NCR53C9x.h ++++ linux-2.4.35.4/drivers/scsi/NCR53C9x.h @@ -144,12 +144,7 @@ #ifndef MULTIPLE_PAD_SIZES @@ -19605,8 +19605,8 @@ Index: linux-2.4.35.4/drivers/scsi/NCR53C9x.h 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 2007-12-15 05:19:44.126935690 +0100 -+++ linux-2.4.35.4/drivers/sound/au1550_i2s.c 2007-12-15 05:19:44.982984472 +0100 +--- linux-2.4.35.4.orig/drivers/sound/au1550_i2s.c ++++ linux-2.4.35.4/drivers/sound/au1550_i2s.c @@ -41,6 +41,7 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. * @@ -19713,7 +19713,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c spinlock_t lock; struct semaphore open_sem; -@@ -114,6 +191,11 @@ +@@ -114,6 +191,11 @@ static struct au1550_state { int no_vra; volatile psc_i2s_t *psc_addr; @@ -19725,7 +19725,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c struct dmabuf { u32 dmanr; unsigned sample_rate; -@@ -195,60 +277,224 @@ +@@ -195,60 +277,224 @@ au1550_delay(int msec) } } @@ -19988,7 +19988,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c } /* stop the ADC before calling */ -@@ -256,27 +502,16 @@ +@@ -256,27 +502,16 @@ static void set_adc_rate(struct au1550_state *s, unsigned rate) { struct dmabuf *adc = &s->dma_adc; @@ -20020,7 +20020,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c } /* stop the DAC before calling */ -@@ -284,26 +519,89 @@ +@@ -284,26 +519,89 @@ static void set_dac_rate(struct au1550_state *s, unsigned rate) { struct dmabuf *dac = &s->dma_dac; @@ -20123,7 +20123,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c } static void -@@ -354,8 +652,7 @@ +@@ -354,8 +652,7 @@ stop_adc(struct au1550_state *s) ip->psc_i2spcr = PSC_I2SPCR_RP; au_sync(); @@ -20133,7 +20133,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c do { stat = ip->psc_i2sstat; au_sync(); -@@ -463,7 +760,6 @@ +@@ -463,7 +760,6 @@ prog_dmabuf(struct au1550_state *s, stru if (db->num_channels == 1) db->cnt_factor *= 2; db->cnt_factor *= db->src_factor; @@ -20141,7 +20141,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c db->count = 0; db->dma_qcount = 0; db->nextIn = db->nextOut = db->rawbuf; -@@ -546,12 +842,13 @@ +@@ -546,12 +842,13 @@ dac_dma_interrupt(int irq, void *dev_id, if (i2s_stat & (PSC_I2SSTAT_TF | PSC_I2SSTAT_TR | PSC_I2SSTAT_TF)) dbg("I2S status = 0x%08x", i2s_stat); #endif @@ -20158,7 +20158,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c } db->nextOut += db->fragsize; if (db->nextOut >= db->rawbuf + db->dmasize) -@@ -606,65 +903,43 @@ +@@ -606,65 +903,43 @@ adc_dma_interrupt(int irq, void *dev_id, } @@ -20250,7 +20250,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c spin_unlock_irqrestore(&s->lock, flags); if (count <= 0) break; -@@ -672,9 +947,9 @@ +@@ -672,9 +947,9 @@ drain_dac(struct au1550_state *s, int no break; if (nonblock) return -EBUSY; @@ -20262,7 +20262,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c au1550_delay(tmo); } if (signal_pending(current)) -@@ -698,8 +973,7 @@ +@@ -698,8 +973,7 @@ static inline s16 U8_TO_S16(u8 ch) * If interpolating (no VRA), duplicate every audio frame src_factor times. */ static int @@ -20272,7 +20272,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c { int sample, i; int interp_bytes_per_sample; -@@ -737,11 +1011,12 @@ +@@ -737,11 +1011,12 @@ translate_from_user(struct dmabuf *db, c /* duplicate every audio frame src_factor times */ @@ -20287,7 +20287,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c } return num_samples * interp_bytes_per_sample; -@@ -996,15 +1271,14 @@ +@@ -996,15 +1271,14 @@ au1550_write(struct file *file, const ch * on the dma queue. If the queue count reaches zero, * we know the dma has stopped. */ @@ -20305,7 +20305,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c db->total_bytes += db->dma_fragsize; if (db->dma_qcount == 0) start_dac(s); -@@ -1017,7 +1291,6 @@ +@@ -1017,7 +1291,6 @@ au1550_write(struct file *file, const ch buffer += usercnt; ret += usercnt; } /* while (count > 0) */ @@ -20313,7 +20313,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c out: up(&s->sem); out2: -@@ -1371,9 +1644,6 @@ +@@ -1371,9 +1644,6 @@ au1550_ioctl(struct inode *inode, struct s->dma_dac.cnt_factor; abinfo.fragstotal = s->dma_dac.numfrag; abinfo.fragments = abinfo.bytes >> s->dma_dac.fragshift; @@ -20323,7 +20323,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c return copy_to_user((void *) arg, &abinfo, sizeof(abinfo)) ? -EFAULT : 0; -@@ -1536,13 +1806,9 @@ +@@ -1536,13 +1806,9 @@ au1550_ioctl(struct inode *inode, struct case SNDCTL_DSP_SETSYNCRO: case SOUND_PCM_READ_FILTER: return -EINVAL; @@ -20338,7 +20338,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c } -@@ -1664,15 +1930,15 @@ +@@ -1664,15 +1930,15 @@ static /*const */ struct file_operations MODULE_AUTHOR("Advanced Micro Devices (AMD), dan@embeddededge.com"); MODULE_DESCRIPTION("Au1550 Audio Driver"); @@ -20357,7 +20357,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c * We know SMBus uses Freq3. * By making changes to this rate, plus the word strobe * size, we can make fine adjustments to the actual data rate. -@@ -1700,11 +1966,17 @@ +@@ -1700,11 +1966,17 @@ intclk_setup(void) */ clk = au_readl(SYS_CLKSRC); au_sync(); @@ -20375,7 +20375,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c static int __devinit au1550_probe(void) -@@ -1724,6 +1996,11 @@ +@@ -1724,6 +1996,11 @@ au1550_probe(void) init_MUTEX(&s->open_sem); spin_lock_init(&s->lock); @@ -20387,7 +20387,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c s->psc_addr = (volatile psc_i2s_t *)I2S_PSC_BASE; ip = s->psc_addr; -@@ -1765,9 +2042,8 @@ +@@ -1765,9 +2042,8 @@ au1550_probe(void) if ((s->dev_audio = register_sound_dsp(&au1550_audio_fops, -1)) < 0) goto err_dev1; @@ -20399,7 +20399,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c goto err_dev2; #endif -@@ -1777,7 +2053,6 @@ +@@ -1777,7 +2053,6 @@ au1550_probe(void) proc_au1550_dump, NULL); #endif /* AU1550_DEBUG */ @@ -20407,7 +20407,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c /* The GPIO for the appropriate PSC was configured by the * board specific start up. -@@ -1786,7 +2061,12 @@ +@@ -1786,7 +2061,12 @@ au1550_probe(void) */ ip->psc_ctrl = PSC_CTRL_DISABLE; /* Disable PSC */ au_sync(); @@ -20420,7 +20420,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c au_sync(); /* Enable PSC -@@ -1806,42 +2086,18 @@ +@@ -1806,42 +2086,18 @@ au1550_probe(void) * Actual I2S mode (first bit delayed by one clock). * Master mode (We provide the clock from the PSC). */ @@ -20469,7 +20469,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c if (s->no_vra) info("no VRA, interpolating and decimating"); -@@ -1866,6 +2122,8 @@ +@@ -1866,6 +2122,8 @@ au1550_probe(void) err_dev2: unregister_sound_dsp(s->dev_audio); #endif @@ -20480,8 +20480,8 @@ Index: linux-2.4.35.4/drivers/sound/au1550_i2s.c err_dma2: Index: linux-2.4.35.4/drivers/sound/au1550_psc.c =================================================================== ---- linux-2.4.35.4.orig/drivers/sound/au1550_psc.c 2007-12-15 05:19:44.134936145 +0100 -+++ linux-2.4.35.4/drivers/sound/au1550_psc.c 2007-12-15 05:19:44.982984472 +0100 +--- linux-2.4.35.4.orig/drivers/sound/au1550_psc.c ++++ linux-2.4.35.4/drivers/sound/au1550_psc.c @@ -30,6 +30,7 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. * @@ -20505,7 +20505,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c #undef OSS_DOCUMENTED_MIXER_SEMANTICS #define AU1550_MODULE_NAME "Au1550 psc audio" -@@ -521,7 +530,14 @@ +@@ -521,7 +530,14 @@ stop_adc(struct au1550_state *s) spin_unlock_irqrestore(&s->lock, flags); } @@ -20521,7 +20521,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c static void set_xmit_slots(int num_channels) { -@@ -565,6 +581,14 @@ +@@ -565,6 +581,14 @@ set_xmit_slots(int num_channels) } while ((stat & PSC_AC97STAT_DR) == 0); } @@ -20536,7 +20536,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c static void set_recv_slots(int num_channels) { -@@ -608,7 +632,6 @@ +@@ -608,7 +632,6 @@ start_dac(struct au1550_state *s) spin_lock_irqsave(&s->lock, flags); @@ -20544,7 +20544,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c au_writel(PSC_AC97PCR_TC, PSC_AC97PCR); au_sync(); au_writel(PSC_AC97PCR_TS, PSC_AC97PCR); -@@ -640,7 +663,6 @@ +@@ -640,7 +663,6 @@ start_adc(struct au1550_state *s) db->nextIn -= db->dmasize; } @@ -20552,7 +20552,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c au1xxx_dbdma_start(db->dmanr); au_writel(PSC_AC97PCR_RC, PSC_AC97PCR); au_sync(); -@@ -752,12 +774,16 @@ +@@ -752,12 +774,16 @@ dac_dma_interrupt(int irq, void *dev_id, if (ac97c_stat & (AC97C_XU | AC97C_XO | AC97C_TE)) dbg("AC97C status = 0x%08x", ac97c_stat); #endif @@ -20570,7 +20570,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c } db->nextOut += db->fragsize; if (db->nextOut >= db->rawbuf + db->dmasize) -@@ -941,11 +967,12 @@ +@@ -941,11 +967,12 @@ translate_from_user(struct dmabuf *db, c /* duplicate every audio frame src_factor times */ @@ -20585,7 +20585,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c } return num_samples * interp_bytes_per_sample; -@@ -1203,7 +1230,7 @@ +@@ -1203,7 +1230,7 @@ au1550_write(struct file *file, const ch while ((db->dma_qcount < 2) && (db->count >= db->fragsize)) { if (au1xxx_dbdma_put_source(db->dmanr, db->nextOut, db->fragsize) == 0) { @@ -20594,7 +20594,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c } db->nextOut += db->fragsize; if (db->nextOut >= db->rawbuf + db->dmasize) -@@ -1481,6 +1508,7 @@ +@@ -1481,6 +1508,7 @@ au1550_ioctl(struct inode *inode, struct return -EINVAL; stop_adc(s); s->dma_adc.num_channels = val; @@ -20602,7 +20602,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c if ((ret = prog_dmabuf_adc(s))) return ret; } -@@ -1538,6 +1566,7 @@ +@@ -1538,6 +1566,7 @@ au1550_ioctl(struct inode *inode, struct } s->dma_dac.num_channels = val; @@ -20610,7 +20610,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c if ((ret = prog_dmabuf_dac(s))) return ret; } -@@ -1832,10 +1861,8 @@ +@@ -1832,10 +1861,8 @@ au1550_open(struct inode *inode, struct down(&s->open_sem); } @@ -20622,7 +20622,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c s->dma_adc.ossfragshift = s->dma_adc.ossmaxfrags = s->dma_adc.subdivision = s->dma_adc.total_bytes = 0; s->dma_adc.num_channels = 1; -@@ -1846,6 +1873,7 @@ +@@ -1846,6 +1873,7 @@ au1550_open(struct inode *inode, struct } if (file->f_mode & FMODE_WRITE) { @@ -20630,7 +20630,7 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c s->dma_dac.ossfragshift = s->dma_dac.ossmaxfrags = s->dma_dac.subdivision = s->dma_dac.total_bytes = 0; s->dma_dac.num_channels = 1; -@@ -2091,6 +2119,9 @@ +@@ -2091,6 +2119,9 @@ au1550_probe(void) ac97_read_proc, &s->codec); #endif @@ -20642,9 +20642,9 @@ Index: linux-2.4.35.4/drivers/sound/au1550_psc.c err_dev3: Index: linux-2.4.35.4/drivers/sound/Config.in =================================================================== ---- linux-2.4.35.4.orig/drivers/sound/Config.in 2007-12-15 05:19:44.142936600 +0100 -+++ linux-2.4.35.4/drivers/sound/Config.in 2007-12-15 05:19:44.982984472 +0100 -@@ -72,10 +72,15 @@ +--- linux-2.4.35.4.orig/drivers/sound/Config.in ++++ linux-2.4.35.4/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 @@ -20666,8 +20666,8 @@ Index: linux-2.4.35.4/drivers/sound/Config.in 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 2007-12-15 05:19:44.150937056 +0100 -+++ linux-2.4.35.4/drivers/tc/lk201.c 2007-12-15 05:19:44.986984701 +0100 +--- linux-2.4.35.4.orig/drivers/tc/lk201.c ++++ linux-2.4.35.4/drivers/tc/lk201.c @@ -5,7 +5,7 @@ * for more details. * @@ -20687,7 +20687,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c #include "lk201.h" /* -@@ -55,19 +55,20 @@ +@@ -55,19 +55,20 @@ unsigned char *kbd_sysrq_xlate = lk201_s unsigned char kbd_sysrq_key = -1; #endif @@ -20714,7 +20714,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c }; /* -@@ -93,28 +94,28 @@ +@@ -93,28 +94,28 @@ static unsigned char lk201_reset_string[ LK_CMD_ENB_BELL, LK_PARAM_VOLUME(4), }; @@ -20750,7 +20750,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c if (r < 0) return r; } -@@ -203,24 +204,26 @@ +@@ -203,24 +204,26 @@ static void parse_kbd_rate(struct kbd_re static int write_kbd_rate(struct kbd_repeat *rep) { @@ -20782,7 +20782,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c { if (rep == NULL) return -EINVAL; -@@ -237,10 +240,8 @@ +@@ -237,10 +240,8 @@ static int lk201kbd_rate(struct kbd_repe return 0; } @@ -20794,7 +20794,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c if (!ticks) return; -@@ -253,20 +254,19 @@ +@@ -253,20 +254,19 @@ static void lk201kd_mksound(unsigned int ticks = 7; ticks = 7 - ticks; @@ -20819,7 +20819,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c return; /* FIXME -- Only Hold and Lock LEDs for now. --macro */ -@@ -275,13 +275,13 @@ +@@ -275,13 +275,13 @@ void kbd_leds(unsigned char leds) if (leds & LED_CAP) l |= LK_LED_LOCK; @@ -20837,7 +20837,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c return; } -@@ -307,7 +307,7 @@ +@@ -307,7 +307,7 @@ char kbd_unexpected_up(unsigned char key return 0x80; } @@ -20846,7 +20846,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c { static unsigned char id[6]; static int id_i; -@@ -316,9 +316,8 @@ +@@ -316,9 +316,8 @@ static void lk201_kbd_rx_char(unsigned c static int prev_scancode; unsigned char c = scancodeRemap[ch]; @@ -20858,7 +20858,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c return; } -@@ -335,7 +334,7 @@ +@@ -335,7 +334,7 @@ static void lk201_kbd_rx_char(unsigned c /* OK, the power-up concluded. */ lk201_report(id); if (id[2] == LK_STAT_PWRUP_OK) @@ -20867,7 +20867,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c else { id_i = 0; printk(KERN_ERR "lk201: keyboard power-up " -@@ -345,7 +344,7 @@ +@@ -345,7 +344,7 @@ static void lk201_kbd_rx_char(unsigned c /* We got the ID; report it and start operation. */ id_i = 0; lk201_id(id); @@ -20876,7 +20876,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c } return; } -@@ -398,29 +397,28 @@ +@@ -398,29 +397,28 @@ static void lk201_kbd_rx_char(unsigned c tasklet_schedule(&keyboard_tasklet); } @@ -20914,7 +20914,7 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c /* Maxine uses LK501 at the Access.Bus. */ if (!LK_IFACE) -@@ -428,19 +426,15 @@ +@@ -428,19 +426,15 @@ void __init kbd_init_hw(void) printk(KERN_INFO "lk201: DECstation LK keyboard driver v0.05.\n"); @@ -20947,8 +20947,8 @@ Index: linux-2.4.35.4/drivers/tc/lk201.c } Index: linux-2.4.35.4/drivers/tc/zs.c =================================================================== ---- linux-2.4.35.4.orig/drivers/tc/zs.c 2007-12-15 05:19:44.158937514 +0100 -+++ linux-2.4.35.4/drivers/tc/zs.c 2007-12-15 05:19:44.986984701 +0100 +--- linux-2.4.35.4.orig/drivers/tc/zs.c ++++ linux-2.4.35.4/drivers/tc/zs.c @@ -68,6 +68,8 @@ #include <asm/bitops.h> #include <asm/uaccess.h> @@ -20958,7 +20958,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c #ifdef CONFIG_DECSTATION #include <asm/dec/interrupts.h> #include <asm/dec/machtype.h> -@@ -160,8 +162,8 @@ +@@ -160,8 +162,8 @@ struct tty_struct zs_ttys[NUM_CHANNELS]; #ifdef CONFIG_SERIAL_DEC_CONSOLE static struct console sercons; #endif @@ -20969,7 +20969,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c static unsigned long break_pressed; /* break, really ... */ #endif -@@ -196,7 +198,6 @@ +@@ -196,7 +198,6 @@ static int serial_refcount; /* * Debugging. */ @@ -20977,7 +20977,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c #undef SERIAL_DEBUG_OPEN #undef SERIAL_DEBUG_FLOW #undef SERIAL_DEBUG_THROTTLE -@@ -221,10 +222,6 @@ +@@ -221,10 +222,6 @@ static struct tty_struct *serial_table[N static struct termios *serial_termios[NUM_CHANNELS]; static struct termios *serial_termios_locked[NUM_CHANNELS]; @@ -20988,7 +20988,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c /* * tmp_buf is used as a temporary buffer by serial_write. We need to * lock it in case the copy_from_user blocks while swapping in a page, -@@ -386,8 +383,6 @@ +@@ -386,8 +383,6 @@ static inline void rs_recv_clear(struct * ----------------------------------------------------------------------- */ @@ -20997,7 +20997,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c /* * This routine is used by the interrupt handler to schedule * processing in the software interrupt portion of the driver. -@@ -414,20 +409,15 @@ +@@ -414,20 +409,15 @@ static _INLINE_ void receive_chars(struc if (!tty && (!info->hook || !info->hook->rx_char)) continue; @@ -21024,7 +21024,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c } else { if (stat & Rx_OVR) { flag = TTY_OVERRUN; -@@ -435,20 +425,22 @@ +@@ -435,20 +425,22 @@ static _INLINE_ void receive_chars(struc flag = TTY_FRAME; } else if (stat & PAR_ERR) { flag = TTY_PARITY; @@ -21054,7 +21054,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c } break_pressed = 0; } -@@ -459,23 +451,7 @@ +@@ -459,23 +451,7 @@ static _INLINE_ void receive_chars(struc return; } @@ -21079,7 +21079,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c } if (tty) tty_flip_buffer_push(tty); -@@ -517,11 +493,15 @@ +@@ -517,11 +493,15 @@ static _INLINE_ void status_handle(struc /* Get status from Read Register 0 */ stat = read_zsreg(info->zs_channel, R0); @@ -21099,7 +21099,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c } if (info->zs_channel != info->zs_chan_a) { -@@ -957,7 +937,7 @@ +@@ -957,7 +937,7 @@ static int rs_write(struct tty_struct * save_flags(flags); while (1) { cli(); @@ -21108,7 +21108,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c SERIAL_XMIT_SIZE - info->xmit_head)); if (c <= 0) break; -@@ -965,7 +945,7 @@ +@@ -965,7 +945,7 @@ static int rs_write(struct tty_struct * if (from_user) { down(&tmp_buf_sem); copy_from_user(tmp_buf, buf, c); @@ -21117,7 +21117,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c SERIAL_XMIT_SIZE - info->xmit_head)); memcpy(info->xmit_buf + info->xmit_head, tmp_buf, c); up(&tmp_buf_sem); -@@ -1282,46 +1262,48 @@ +@@ -1282,46 +1262,48 @@ static int rs_ioctl(struct tty_struct *t } switch (cmd) { @@ -21204,7 +21204,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c return 0; } -@@ -1446,7 +1428,8 @@ +@@ -1446,7 +1428,8 @@ static void rs_close(struct tty_struct * static void rs_wait_until_sent(struct tty_struct *tty, int timeout) { struct dec_serial *info = (struct dec_serial *) tty->driver_data; @@ -21214,7 +21214,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c if (serial_paranoia_check(info, tty->device, "rs_wait_until_sent")) return; -@@ -1462,7 +1445,7 @@ +@@ -1462,7 +1445,7 @@ static void rs_wait_until_sent(struct tt if (char_time == 0) char_time = 1; if (timeout) @@ -21223,7 +21223,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c while ((read_zsreg(info->zs_channel, 1) & Tx_BUF_EMP) == 0) { current->state = TASK_INTERRUPTIBLE; schedule_timeout(char_time); -@@ -1714,7 +1697,7 @@ +@@ -1714,7 +1697,7 @@ int rs_open(struct tty_struct *tty, stru static void __init show_serial_version(void) { @@ -21232,7 +21232,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c } /* Initialize Z8530s zs_channels -@@ -1994,8 +1977,9 @@ +@@ -1994,8 +1977,9 @@ int __init zs_init(void) * polling I/O routines */ static int @@ -21243,7 +21243,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c struct dec_zschannel *chan = info->zs_channel; int ret; -@@ -2017,8 +2001,9 @@ +@@ -2017,8 +2001,9 @@ zs_poll_tx_char(struct dec_serial *info, } static int @@ -21254,7 +21254,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c struct dec_zschannel *chan = info->zs_channel; int ret; -@@ -2038,12 +2023,13 @@ +@@ -2038,12 +2023,13 @@ zs_poll_rx_char(struct dec_serial *info) return -ENODEV; } @@ -21270,7 +21270,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c return 0; } else { -@@ -2055,7 +2041,7 @@ +@@ -2055,7 +2041,7 @@ unsigned int register_zs_hook(unsigned i } } @@ -21279,7 +21279,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c { struct dec_serial *info = &zs_soft[channel]; -@@ -2063,8 +2049,8 @@ +@@ -2063,8 +2049,8 @@ unsigned int unregister_zs_hook(unsigned info->hook = NULL; return 1; } else { @@ -21290,7 +21290,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c return 0; } } -@@ -2319,22 +2305,23 @@ +@@ -2319,22 +2305,23 @@ void kgdb_interruptible(int yes) write_zsreg(chan, 9, nine); } @@ -21320,7 +21320,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.c } /* This sets up the serial port we're using, and turns on -@@ -2360,11 +2347,11 @@ +@@ -2360,11 +2347,11 @@ static inline void kgdb_chaninit(struct * for /dev/ttyb which is determined in setup_arch() from the * boot command line flags. */ @@ -21339,8 +21339,8 @@ Index: linux-2.4.35.4/drivers/tc/zs.c 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 2007-12-15 05:19:44.166937969 +0100 -+++ linux-2.4.35.4/drivers/tc/zs.h 2007-12-15 05:19:44.986984701 +0100 +--- linux-2.4.35.4.orig/drivers/tc/zs.h ++++ linux-2.4.35.4/drivers/tc/zs.h @@ -1,14 +1,18 @@ /* - * macserial.h: Definitions for the Macintosh Z8530 serial driver. @@ -21361,7 +21361,7 @@ Index: linux-2.4.35.4/drivers/tc/zs.h #define NUM_ZSREGS 16 struct serial_struct { -@@ -89,63 +93,50 @@ +@@ -89,63 +93,50 @@ struct dec_zschannel { unsigned char curregs[NUM_ZSREGS]; }; @@ -21451,8 +21451,8 @@ Index: linux-2.4.35.4/drivers/tc/zs.h int xmit_tail; Index: linux-2.4.35.4/drivers/video/au1200fb.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/video/au1200fb.c 2007-12-15 05:19:44.990984927 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/video/au1200fb.c @@ -0,0 +1,1564 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -23020,8 +23020,8 @@ Index: linux-2.4.35.4/drivers/video/au1200fb.c + Index: linux-2.4.35.4/drivers/video/au1200fb.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/video/au1200fb.h 2007-12-15 05:19:44.990984927 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/video/au1200fb.h @@ -0,0 +1,288 @@ +/* + * BRIEF MODULE DESCRIPTION @@ -23313,9 +23313,9 @@ Index: linux-2.4.35.4/drivers/video/au1200fb.h +#endif /* _AU1200LCD_H */ Index: linux-2.4.35.4/drivers/video/Config.in =================================================================== ---- linux-2.4.35.4.orig/drivers/video/Config.in 2007-12-15 05:19:44.186939109 +0100 -+++ linux-2.4.35.4/drivers/video/Config.in 2007-12-15 05:19:44.990984927 +0100 -@@ -87,8 +87,8 @@ +--- linux-2.4.35.4.orig/drivers/video/Config.in ++++ linux-2.4.35.4/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 @@ -23326,7 +23326,7 @@ Index: linux-2.4.35.4/drivers/video/Config.in fi if [ "$CONFIG_X86" = "y" ]; then bool ' VESA VGA graphics console' CONFIG_FB_VESA -@@ -121,6 +121,17 @@ +@@ -121,6 +121,17 @@ if [ "$CONFIG_FB" = "y" ]; then hex ' Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000 fi fi @@ -23344,7 +23344,7 @@ Index: linux-2.4.35.4/drivers/video/Config.in if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then if [ "$CONFIG_PCI" != "n" ]; then tristate ' Matrox acceleration (EXPERIMENTAL)' CONFIG_FB_MATROX -@@ -178,9 +189,6 @@ +@@ -178,9 +189,6 @@ if [ "$CONFIG_FB" = "y" ]; then bool ' Use CRT on Pb1100 ' CONFIG_PB1500_CRT bool ' Use TFT Panel on Pb1100 ' CONFIG_PB1500_TFT fi @@ -23356,9 +23356,9 @@ Index: linux-2.4.35.4/drivers/video/Config.in fi Index: linux-2.4.35.4/drivers/video/fbmem.c =================================================================== ---- linux-2.4.35.4.orig/drivers/video/fbmem.c 2007-12-15 05:19:44.194939564 +0100 -+++ linux-2.4.35.4/drivers/video/fbmem.c 2007-12-15 05:19:44.994985156 +0100 -@@ -139,6 +139,8 @@ +--- linux-2.4.35.4.orig/drivers/video/fbmem.c ++++ linux-2.4.35.4/drivers/video/fbmem.c +@@ -139,6 +139,8 @@ extern int e1356fb_init(void); extern int e1356fb_setup(char*); extern int au1100fb_init(void); extern int au1100fb_setup(char*); @@ -23367,7 +23367,7 @@ Index: linux-2.4.35.4/drivers/video/fbmem.c extern int pvr2fb_init(void); extern int pvr2fb_setup(char*); extern int sstfb_init(void); -@@ -331,6 +333,9 @@ +@@ -331,6 +333,9 @@ static struct { #ifdef CONFIG_FB_AU1100 { "au1100fb", au1100fb_init, au1100fb_setup }, #endif @@ -23379,8 +23379,8 @@ Index: linux-2.4.35.4/drivers/video/fbmem.c #endif Index: linux-2.4.35.4/drivers/video/ims332.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/video/ims332.h 2007-12-15 05:19:44.994985156 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/video/ims332.h @@ -0,0 +1,275 @@ +/* + * linux/drivers/video/ims332.h @@ -23659,9 +23659,9 @@ Index: linux-2.4.35.4/drivers/video/ims332.h +} Index: linux-2.4.35.4/drivers/video/Makefile =================================================================== ---- linux-2.4.35.4.orig/drivers/video/Makefile 2007-12-15 05:19:44.206940249 +0100 -+++ linux-2.4.35.4/drivers/video/Makefile 2007-12-15 05:19:44.994985156 +0100 -@@ -87,6 +87,7 @@ +--- linux-2.4.35.4.orig/drivers/video/Makefile ++++ linux-2.4.35.4/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_AU1100) += au1100fb.o fbgen.o @@ -23671,8 +23671,8 @@ Index: linux-2.4.35.4/drivers/video/Makefile 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 2007-12-15 05:19:44.214940704 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- linux-2.4.35.4.orig/drivers/video/maxinefb.h ++++ /dev/null @@ -1,38 +0,0 @@ -/* - * linux/drivers/video/maxinefb.h @@ -23714,8 +23714,8 @@ Index: linux-2.4.35.4/drivers/video/maxinefb.h - /* 3 entries */ Index: linux-2.4.35.4/drivers/video/newport_con.c =================================================================== ---- linux-2.4.35.4.orig/drivers/video/newport_con.c 2007-12-15 05:19:44.222941159 +0100 -+++ linux-2.4.35.4/drivers/video/newport_con.c 2007-12-15 05:19:45.002985611 +0100 +--- linux-2.4.35.4.orig/drivers/video/newport_con.c ++++ linux-2.4.35.4/drivers/video/newport_con.c @@ -22,6 +22,7 @@ #include <linux/module.h> #include <linux/slab.h> @@ -23724,7 +23724,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c #include <asm/uaccess.h> #include <asm/system.h> #include <asm/page.h> -@@ -77,7 +78,7 @@ +@@ -77,7 +78,7 @@ static int newport_set_def_font(int unit static inline void newport_render_background(int xstart, int ystart, int xend, int yend, int ci) { @@ -23733,7 +23733,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c npregs->set.wrmask = 0xffffffff; npregs->set.drawmode0 = (NPORT_DMODE0_DRAW | NPORT_DMODE0_BLOCK | NPORT_DMODE0_DOSETUP | NPORT_DMODE0_STOPX -@@ -94,7 +95,7 @@ +@@ -94,7 +95,7 @@ static inline void newport_init_cmap(voi unsigned short i; for (i = 0; i < 16; i++) { @@ -23742,7 +23742,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c newport_cmap_setaddr(npregs, color_table[i]); newport_cmap_setrgb(npregs, default_red[i], -@@ -107,7 +108,7 @@ +@@ -107,7 +108,7 @@ static inline void newport_show_logo(voi unsigned long i; for (i = 0; i < LINUX_LOGO_COLORS; i++) { @@ -23751,7 +23751,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c newport_cmap_setaddr(npregs, i + 0x20); newport_cmap_setrgb(npregs, linux_logo_red[i], -@@ -115,13 +116,13 @@ +@@ -115,13 +116,13 @@ static inline void newport_show_logo(voi linux_logo_blue[i]); } @@ -23767,7 +23767,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c for (i = 0; i < LOGO_W * LOGO_H; i++) npregs->go.hostrw0 = linux_logo[i] << 24; -@@ -133,7 +134,7 @@ +@@ -133,7 +134,7 @@ static inline void newport_clear_screen( if (logo_active) return; @@ -23776,7 +23776,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c npregs->set.wrmask = 0xffffffff; npregs->set.drawmode0 = (NPORT_DMODE0_DRAW | NPORT_DMODE0_BLOCK | NPORT_DMODE0_DOSETUP | NPORT_DMODE0_STOPX -@@ -155,7 +156,7 @@ +@@ -155,7 +156,7 @@ void newport_reset(void) unsigned short treg; int i; @@ -23785,7 +23785,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c treg = newport_vc2_get(npregs, VC2_IREG_CONTROL); newport_vc2_set(npregs, VC2_IREG_CONTROL, (treg | VC2_CTRL_EVIDEO)); -@@ -165,7 +166,7 @@ +@@ -165,7 +166,7 @@ void newport_reset(void) npregs->set.dcbmode = (NPORT_DMODE_AVC2 | VC2_REGADDR_RAM | NPORT_DMODE_W2 | VC2_PROTOCOL); for (i = 0; i < 128; i++) { @@ -23794,7 +23794,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c if (i == 92 || i == 94) npregs->set.dcbdata0.byshort.s1 = 0xff00; else -@@ -205,7 +206,7 @@ +@@ -205,7 +206,7 @@ void newport_get_screensize(void) npregs->set.dcbmode = (NPORT_DMODE_AVC2 | VC2_REGADDR_RAM | NPORT_DMODE_W2 | VC2_PROTOCOL); for (i = 0; i < 128; i++) { @@ -23803,7 +23803,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c linetable[i] = npregs->set.dcbdata0.byshort.s1; } -@@ -216,12 +217,12 @@ +@@ -216,12 +217,12 @@ void newport_get_screensize(void) npregs->set.dcbmode = (NPORT_DMODE_AVC2 | VC2_REGADDR_RAM | NPORT_DMODE_W2 | VC2_PROTOCOL); do { @@ -23818,7 +23818,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c treg = npregs->set.dcbdata0.byshort.s1; } } while ((treg & 0x8000) == 0); -@@ -291,16 +292,16 @@ +@@ -291,16 +292,16 @@ static const char *newport_startup(void) if (!sgi_gfxaddr) return NULL; @@ -23840,7 +23840,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c for (i = 0; i < MAX_NR_CONSOLES; i++) font_data[i] = FONT_DATA; -@@ -310,6 +311,10 @@ +@@ -310,6 +311,10 @@ static const char *newport_startup(void) newport_get_screensize(); return "SGI Newport"; @@ -23851,7 +23851,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c } static void newport_init(struct vc_data *vc, int init) -@@ -363,7 +368,7 @@ +@@ -363,7 +368,7 @@ static void newport_putc(struct vc_data (charattr & 0xf0) >> 4); /* Set the color and drawing mode. */ @@ -23860,7 +23860,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c npregs->set.colori = charattr & 0xf; npregs->set.drawmode0 = (NPORT_DMODE0_DRAW | NPORT_DMODE0_BLOCK | NPORT_DMODE0_STOPX | NPORT_DMODE0_ZPENAB | -@@ -372,7 +377,7 @@ +@@ -372,7 +377,7 @@ static void newport_putc(struct vc_data /* Set coordinates for bitmap operation. */ npregs->set.xystarti = (xpos << 16) | ((ypos + topscan) & 0x3ff); npregs->set.xyendi = ((xpos + 7) << 16); @@ -23869,7 +23869,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c /* Go, baby, go... */ RENDER(npregs, p); -@@ -396,7 +401,7 @@ +@@ -396,7 +401,7 @@ static void newport_putcs(struct vc_data xpos + ((count - 1) << 3), ypos, (charattr & 0xf0) >> 4); @@ -23878,7 +23878,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c /* Set the color and drawing mode. */ npregs->set.colori = charattr & 0xf; -@@ -407,7 +412,7 @@ +@@ -407,7 +412,7 @@ static void newport_putcs(struct vc_data for (i = 0; i < count; i++, xpos += 8) { p = &font_data[vc->vc_num][(scr_readw(s++) & 0xff) << 4]; @@ -23887,7 +23887,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c /* Set coordinates for bitmap operation. */ npregs->set.xystarti = -@@ -689,7 +694,7 @@ +@@ -689,7 +694,7 @@ static void newport_bmove(struct vc_data xe = xs; xs = tmp; } @@ -23896,7 +23896,7 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c npregs->set.drawmode0 = (NPORT_DMODE0_S2S | NPORT_DMODE0_BLOCK | NPORT_DMODE0_DOSETUP | NPORT_DMODE0_STOPX | NPORT_DMODE0_STOPY); -@@ -706,35 +711,35 @@ +@@ -706,35 +711,35 @@ static int newport_dummy(struct vc_data #define DUMMY (void *) newport_dummy const struct consw newport_con = { @@ -23951,8 +23951,8 @@ Index: linux-2.4.35.4/drivers/video/newport_con.c 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 2007-12-15 05:19:44.230941615 +0100 -+++ linux-2.4.35.4/drivers/video/tgafb.c 2007-12-15 05:19:45.002985611 +0100 +--- linux-2.4.35.4.orig/drivers/video/tgafb.c ++++ linux-2.4.35.4/drivers/video/tgafb.c @@ -45,6 +45,15 @@ #include <linux/console.h> #include <asm/io.h> @@ -23969,7 +23969,7 @@ Index: linux-2.4.35.4/drivers/video/tgafb.c #include <video/fbcon.h> #include <video/fbcon-cfb8.h> #include <video/fbcon-cfb32.h> -@@ -84,10 +93,10 @@ +@@ -84,10 +93,10 @@ static unsigned int fb_offset_presets[4] }; static unsigned int deep_presets[4] = { @@ -23983,7 +23983,7 @@ Index: linux-2.4.35.4/drivers/video/tgafb.c }; static unsigned int rasterop_presets[4] = { -@@ -131,6 +140,13 @@ +@@ -131,6 +140,13 @@ static struct { 0, FB_VMODE_NONINTERLACED }}, @@ -23997,7 +23997,7 @@ Index: linux-2.4.35.4/drivers/video/tgafb.c { "800x600-56", { 800, 600, 800, 600, 0, 0, 0, 0, {0, 8, 0}, {0, 8, 0}, {0, 8, 0}, {0, 0, 0}, -@@ -488,7 +504,8 @@ +@@ -488,7 +504,8 @@ static void tgafb_set_par(const void *fb continue; mb(); @@ -24007,7 +24007,7 @@ Index: linux-2.4.35.4/drivers/video/tgafb.c while (TGA_READ_REG(TGA_CMD_STAT_REG) & 1) /* wait for not busy */ continue; mb(); -@@ -548,7 +565,7 @@ +@@ -548,7 +565,7 @@ static void tgafb_set_par(const void *fb BT463_WRITE(BT463_REG_ACC, BT463_CMD_REG_0, 0x40); BT463_WRITE(BT463_REG_ACC, BT463_CMD_REG_1, 0x08); BT463_WRITE(BT463_REG_ACC, BT463_CMD_REG_2, @@ -24016,7 +24016,7 @@ Index: linux-2.4.35.4/drivers/video/tgafb.c BT463_WRITE(BT463_REG_ACC, BT463_READ_MASK_0, 0xff); BT463_WRITE(BT463_REG_ACC, BT463_READ_MASK_1, 0xff); -@@ -921,19 +938,34 @@ +@@ -921,19 +938,34 @@ int __init tgafb_setup(char *options) { int __init tgafb_init(void) { struct pci_dev *pdev; @@ -24056,7 +24056,7 @@ Index: linux-2.4.35.4/drivers/video/tgafb.c /* setup framebuffer */ -@@ -950,40 +982,62 @@ +@@ -950,40 +982,62 @@ int __init tgafb_init(void) fb_info.gen.fbhw = &tgafb_hwswitch; fb_info.gen.fbhw->detect(); @@ -24131,8 +24131,8 @@ Index: linux-2.4.35.4/drivers/video/tgafb.c Index: linux-2.4.35.4/drivers/video/tgafb.h =================================================================== ---- linux-2.4.35.4.orig/drivers/video/tgafb.h 2007-12-15 05:19:44.238942073 +0100 -+++ linux-2.4.35.4/drivers/video/tgafb.h 2007-12-15 05:19:45.002985611 +0100 +--- linux-2.4.35.4.orig/drivers/video/tgafb.h ++++ linux-2.4.35.4/drivers/video/tgafb.h @@ -36,6 +36,7 @@ #define TGA_RASTEROP_REG 0x0034 #define TGA_PIXELSHIFT_REG 0x0038 @@ -24143,9 +24143,9 @@ Index: linux-2.4.35.4/drivers/video/tgafb.h #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 2007-12-15 05:19:44.246942528 +0100 -+++ linux-2.4.35.4/fs/binfmt_elf.c 2007-12-15 05:19:45.006985841 +0100 -@@ -665,6 +665,9 @@ +--- linux-2.4.35.4.orig/fs/binfmt_elf.c ++++ linux-2.4.35.4/fs/binfmt_elf.c +@@ -665,6 +665,9 @@ static int load_elf_binary(struct linux_ bprm->argc++; } } @@ -24155,7 +24155,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c } /* Flush all traces of the currently running executable */ -@@ -1225,7 +1228,11 @@ +@@ -1225,7 +1228,11 @@ static int elf_core_dump(long signr, str elf.e_entry = 0; elf.e_phoff = sizeof(elf); elf.e_shoff = 0; @@ -24169,8 +24169,8 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c 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 2007-12-15 05:19:44.254942983 +0100 -+++ linux-2.4.35.4/fs/partitions/sgi.c 2007-12-15 05:19:45.006985841 +0100 +--- linux-2.4.35.4.orig/fs/partitions/sgi.c ++++ linux-2.4.35.4/fs/partitions/sgi.c @@ -17,6 +17,11 @@ #include "check.h" #include "sgi.h" @@ -24183,7 +24183,7 @@ Index: linux-2.4.35.4/fs/partitions/sgi.c int sgi_partition(struct gendisk *hd, struct block_device *bdev, unsigned long first_sector, int current_minor) { int i, csum, magic; -@@ -77,6 +82,10 @@ +@@ -77,6 +82,10 @@ int sgi_partition(struct gendisk *hd, st if(!blocks) continue; add_gd_partition(hd, current_minor, start, blocks); @@ -24196,9 +24196,9 @@ Index: linux-2.4.35.4/fs/partitions/sgi.c printk("\n"); Index: linux-2.4.35.4/fs/proc/array.c =================================================================== ---- linux-2.4.35.4.orig/fs/proc/array.c 2007-12-15 05:19:44.262943439 +0100 -+++ linux-2.4.35.4/fs/proc/array.c 2007-12-15 05:19:45.006985841 +0100 -@@ -368,15 +368,15 @@ +--- linux-2.4.35.4.orig/fs/proc/array.c ++++ linux-2.4.35.4/fs/proc/array.c +@@ -368,15 +368,15 @@ int proc_pid_stat(struct task_struct *ta task->cmin_flt, task->maj_flt, task->cmaj_flt, @@ -24219,7 +24219,7 @@ Index: linux-2.4.35.4/fs/proc/array.c vsize, mm ? mm->rss : 0, /* you might want to shift this left 3 */ task->rlim[RLIMIT_RSS].rlim_cur, -@@ -615,14 +615,14 @@ +@@ -615,14 +615,14 @@ int proc_pid_cpu(struct task_struct *tas len = sprintf(buffer, "cpu %lu %lu\n", @@ -24240,9 +24240,9 @@ Index: linux-2.4.35.4/fs/proc/array.c } Index: linux-2.4.35.4/fs/proc/proc_misc.c =================================================================== ---- linux-2.4.35.4.orig/fs/proc/proc_misc.c 2007-12-15 05:19:44.270943894 +0100 -+++ linux-2.4.35.4/fs/proc/proc_misc.c 2007-12-15 05:19:45.006985841 +0100 -@@ -308,16 +308,16 @@ +--- linux-2.4.35.4.orig/fs/proc/proc_misc.c ++++ linux-2.4.35.4/fs/proc/proc_misc.c +@@ -308,16 +308,16 @@ static int kstat_read_proc(char *page, c { int i, len = 0; extern unsigned long total_forks; @@ -24263,7 +24263,7 @@ Index: linux-2.4.35.4/fs/proc/proc_misc.c #if !defined(CONFIG_ARCH_S390) for (j = 0 ; j < NR_IRQS ; j++) sum += kstat.irqs[cpu][j]; -@@ -331,10 +331,10 @@ +@@ -331,10 +331,10 @@ static int kstat_read_proc(char *page, c proc_sprintf(page, &off, &len, "cpu%d %u %u %u %lu\n", i, @@ -24280,8 +24280,8 @@ Index: linux-2.4.35.4/fs/proc/proc_misc.c 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 2007-12-15 05:19:44.278944352 +0100 -+++ linux-2.4.35.4/include/asm-alpha/param.h 2007-12-15 05:19:45.010986067 +0100 +--- linux-2.4.35.4.orig/include/asm-alpha/param.h ++++ linux-2.4.35.4/include/asm-alpha/param.h @@ -13,6 +13,9 @@ # else # define HZ 1200 @@ -24294,8 +24294,8 @@ Index: linux-2.4.35.4/include/asm-alpha/param.h #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 2007-12-15 05:19:44.290945034 +0100 -+++ linux-2.4.35.4/include/asm-i386/param.h 2007-12-15 05:19:45.010986067 +0100 +--- linux-2.4.35.4.orig/include/asm-i386/param.h ++++ linux-2.4.35.4/include/asm-i386/param.h @@ -3,6 +3,9 @@ #ifndef HZ @@ -24308,8 +24308,8 @@ Index: linux-2.4.35.4/include/asm-i386/param.h #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 2007-12-15 05:19:44.298945492 +0100 -+++ linux-2.4.35.4/include/asm-ia64/param.h 2007-12-15 05:19:45.010986067 +0100 +--- linux-2.4.35.4.orig/include/asm-ia64/param.h ++++ linux-2.4.35.4/include/asm-ia64/param.h @@ -7,9 +7,15 @@ * Based on <asm-i386/param.h>. * @@ -24329,8 +24329,8 @@ Index: linux-2.4.35.4/include/asm-ia64/param.h #ifndef NGROUPS Index: linux-2.4.35.4/include/asm-m68k/param.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-m68k/param.h 2007-12-15 05:19:44.306945948 +0100 -+++ linux-2.4.35.4/include/asm-m68k/param.h 2007-12-15 05:19:45.010986067 +0100 +--- linux-2.4.35.4.orig/include/asm-m68k/param.h ++++ linux-2.4.35.4/include/asm-m68k/param.h @@ -3,6 +3,9 @@ #ifndef HZ @@ -24343,8 +24343,8 @@ Index: linux-2.4.35.4/include/asm-m68k/param.h #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 2007-12-15 05:19:44.314946403 +0100 -+++ linux-2.4.35.4/include/asm-mips/au1000_gpio.h 2007-12-15 05:19:45.014986296 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/au1000_gpio.h ++++ linux-2.4.35.4/include/asm-mips/au1000_gpio.h @@ -30,6 +30,13 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -24462,9 +24462,9 @@ Index: linux-2.4.35.4/include/asm-mips/au1000_gpio.h #endif Index: linux-2.4.35.4/include/asm-mips/au1000.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/au1000.h 2007-12-15 05:19:44.322946858 +0100 -+++ linux-2.4.35.4/include/asm-mips/au1000.h 2007-12-15 05:19:45.018986525 +0100 -@@ -160,28 +160,356 @@ +--- linux-2.4.35.4.orig/include/asm-mips/au1000.h ++++ linux-2.4.35.4/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 @@ -24839,7 +24839,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h /* Static Bus Controller */ #define MEM_STCFG0 0xB4001000 #define MEM_STTIME0 0xB4001004 -@@ -367,7 +695,7 @@ +@@ -367,7 +695,7 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define AU1000_MAC0_ENABLE 0xB0520000 #define AU1000_MAC1_ENABLE 0xB0520004 #define NUM_ETH_INTERFACES 2 @@ -24848,7 +24848,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h /* Au1500 */ #ifdef CONFIG_SOC_AU1500 -@@ -438,7 +766,7 @@ +@@ -438,7 +766,7 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define AU1500_MAC0_ENABLE 0xB1520000 #define AU1500_MAC1_ENABLE 0xB1520004 #define NUM_ETH_INTERFACES 2 @@ -24857,7 +24857,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h /* Au1100 */ #ifdef CONFIG_SOC_AU1100 -@@ -483,6 +811,22 @@ +@@ -483,6 +811,22 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define AU1000_GPIO_13 45 #define AU1000_GPIO_14 46 #define AU1000_GPIO_15 47 @@ -24880,7 +24880,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h #define UART0_ADDR 0xB1100000 #define UART1_ADDR 0xB1200000 -@@ -494,7 +838,7 @@ +@@ -494,7 +838,7 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define AU1100_ETH0_BASE 0xB0500000 #define AU1100_MAC0_ENABLE 0xB0520000 #define NUM_ETH_INTERFACES 1 @@ -24889,7 +24889,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h #ifdef CONFIG_SOC_AU1550 #define AU1550_UART0_INT 0 -@@ -511,14 +855,14 @@ +@@ -511,14 +855,14 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define AU1550_PSC1_INT 11 #define AU1550_PSC2_INT 12 #define AU1550_PSC3_INT 13 @@ -24912,7 +24912,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h #define AU1550_NAND_INT 23 #define AU1550_USB_DEV_REQ_INT 24 #define AU1550_USB_DEV_SUS_INT 25 -@@ -573,7 +917,7 @@ +@@ -573,7 +917,7 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define AU1550_MAC0_ENABLE 0xB0520000 #define AU1550_MAC1_ENABLE 0xB0520004 #define NUM_ETH_INTERFACES 2 @@ -24921,7 +24921,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h #ifdef CONFIG_SOC_AU1200 #define AU1200_UART0_INT 0 -@@ -590,14 +934,14 @@ +@@ -590,14 +934,14 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define AU1200_PSC1_INT 11 #define AU1200_AES_INT 12 #define AU1200_CAMERA_INT 13 @@ -24944,7 +24944,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h #define AU1200_NAND_INT 23 #define AU1200_GPIO_204 24 #define AU1200_GPIO_205 25 -@@ -605,6 +949,7 @@ +@@ -605,6 +949,7 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define AU1200_GPIO_207 27 #define AU1200_GPIO_208_215 28 // Logical OR of 208:215 #define AU1200_USB_INT 29 @@ -24952,7 +24952,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h #define AU1200_LCD_INT 30 #define AU1200_MAE_BOTH_INT 31 #define AU1000_GPIO_0 32 -@@ -643,21 +988,36 @@ +@@ -643,21 +988,36 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define UART0_ADDR 0xB1100000 #define UART1_ADDR 0xB1200000 @@ -24999,7 +24999,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h /* Programmable Counters 0 and 1 */ #define SYS_BASE 0xB1900000 #define SYS_COUNTER_CNTRL (SYS_BASE + 0x14) -@@ -728,6 +1088,8 @@ +@@ -728,6 +1088,8 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define I2S_CONTROL_D (1<<1) #define I2S_CONTROL_CE (1<<0) @@ -25008,7 +25008,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h /* USB Host Controller */ #define USB_OHCI_LEN 0x00100000 -@@ -773,6 +1135,8 @@ +@@ -773,6 +1135,8 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define USBDEV_ENABLE (1<<1) #define USBDEV_CE (1<<0) @@ -25017,7 +25017,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h /* Ethernet Controllers */ /* 4 byte offsets from AU1000_ETH_BASE */ -@@ -1171,6 +1535,37 @@ +@@ -1171,6 +1535,37 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define SYS_PF_PSC1_S1 (1 << 1) #define SYS_PF_MUST_BE_SET ((1 << 5) | (1 << 2)) @@ -25055,7 +25055,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h #define SYS_TRIOUTRD 0xB1900100 #define SYS_TRIOUTCLR 0xB1900100 #define SYS_OUTPUTRD 0xB1900108 -@@ -1298,7 +1693,6 @@ +@@ -1298,7 +1693,6 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #define SD1_XMIT_FIFO 0xB0680000 #define SD1_RECV_FIFO 0xB0680004 @@ -25063,7 +25063,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h #if defined (CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550) /* Au1500 PCI Controller */ #define Au1500_CFG_BASE 0xB4005000 // virtual, kseg0 addr -@@ -1388,9 +1782,60 @@ +@@ -1388,9 +1782,60 @@ extern au1xxx_irq_map_t au1xxx_irq_map[] #endif @@ -25124,7 +25124,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h struct cpu_spec { /* CPU is matched via (PRID & prid_mask) == prid_value */ unsigned int prid_mask; -@@ -1404,3 +1849,6 @@ +@@ -1404,3 +1849,6 @@ struct cpu_spec { extern struct cpu_spec cpu_specs[]; extern struct cpu_spec *cur_cpu_spec[]; #endif @@ -25133,8 +25133,8 @@ Index: linux-2.4.35.4/include/asm-mips/au1000.h + Index: linux-2.4.35.4/include/asm-mips/au1000_pcmcia.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/au1000_pcmcia.h 2007-12-15 05:19:44.330947314 +0100 -+++ linux-2.4.35.4/include/asm-mips/au1000_pcmcia.h 2007-12-15 05:19:45.022986751 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/au1000_pcmcia.h ++++ linux-2.4.35.4/include/asm-mips/au1000_pcmcia.h @@ -38,16 +38,41 @@ #define AU1X_SOCK0_PHYS_MEM 0xF80000000 @@ -25188,8 +25188,8 @@ Index: linux-2.4.35.4/include/asm-mips/au1000_pcmcia.h 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 2007-12-15 05:19:44.338947772 +0100 -+++ linux-2.4.35.4/include/asm-mips/au1100_mmc.h 2007-12-15 05:19:45.022986751 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/au1100_mmc.h ++++ linux-2.4.35.4/include/asm-mips/au1100_mmc.h @@ -39,16 +39,22 @@ #define __ASM_AU1100_MMC_H @@ -25233,8 +25233,8 @@ Index: linux-2.4.35.4/include/asm-mips/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 2007-12-15 05:19:44.342947998 +0100 -+++ linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h 2007-12-15 05:19:45.022986751 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/au1xxx_dbdma.h ++++ linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h @@ -43,7 +43,7 @@ #define DDMA_GLOBAL_BASE 0xb4003000 #define DDMA_CHANNEL_BASE 0xb4002000 @@ -25244,7 +25244,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h u32 ddma_config; u32 ddma_intstat; u32 ddma_throttle; -@@ -60,7 +60,7 @@ +@@ -60,7 +60,7 @@ typedef struct dbdma_global { /* The structure of a DMA Channel. */ @@ -25253,7 +25253,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h u32 ddma_cfg; /* See below */ u32 ddma_desptr; /* 32-byte aligned pointer to descriptor */ u32 ddma_statptr; /* word aligned pointer to status word */ -@@ -96,7 +96,7 @@ +@@ -96,7 +96,7 @@ typedef struct au1xxx_dma_channel { /* "Standard" DDMA Descriptor. * Must be 32-byte aligned. */ @@ -25262,7 +25262,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h u32 dscr_cmd0; /* See below */ u32 dscr_cmd1; /* See below */ u32 dscr_source0; /* source phys address */ -@@ -105,6 +105,12 @@ +@@ -105,6 +105,12 @@ typedef struct au1xxx_ddma_desc { u32 dscr_dest1; /* See below */ u32 dscr_stat; /* completion status */ u32 dscr_nxtptr; /* Next descriptor pointer (mostly) */ @@ -25275,7 +25275,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h } au1x_ddma_desc_t; #define DSCR_CMD0_V (1 << 31) /* Descriptor valid */ -@@ -123,6 +129,8 @@ +@@ -123,6 +129,8 @@ typedef struct au1xxx_ddma_desc { #define DSCR_CMD0_CV (0x1 << 2) /* Clear Valid when done */ #define DSCR_CMD0_ST_MASK (0x3 << 0) /* Status instruction */ @@ -25284,7 +25284,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h /* Command 0 device IDs. */ #ifdef CONFIG_SOC_AU1550 -@@ -169,8 +177,8 @@ +@@ -169,8 +177,8 @@ typedef struct au1xxx_ddma_desc { #define DSCR_CMD0_SDMS_RX0 9 #define DSCR_CMD0_SDMS_TX1 10 #define DSCR_CMD0_SDMS_RX1 11 @@ -25295,7 +25295,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h #define DSCR_CMD0_PSC0_TX 14 #define DSCR_CMD0_PSC0_RX 15 #define DSCR_CMD0_PSC1_TX 16 -@@ -189,6 +197,10 @@ +@@ -189,6 +197,10 @@ typedef struct au1xxx_ddma_desc { #define DSCR_CMD0_THROTTLE 30 #define DSCR_CMD0_ALWAYS 31 #define DSCR_NDEV_IDS 32 @@ -25306,7 +25306,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h #define DSCR_CMD0_SID(x) (((x) & 0x1f) << 25) #define DSCR_CMD0_DID(x) (((x) & 0x1f) << 20) -@@ -277,6 +289,43 @@ +@@ -277,6 +289,43 @@ typedef struct au1xxx_ddma_desc { */ #define NUM_DBDMA_CHANS 16 @@ -25350,7 +25350,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h /* External functions for drivers to use. */ /* Use this to allocate a dbdma channel. The device ids are one of the -@@ -299,8 +348,8 @@ +@@ -299,8 +348,8 @@ u32 au1xxx_dbdma_ring_alloc(u32 chanid, /* Put buffers on source/destination descriptors. */ @@ -25361,7 +25361,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h /* Get a buffer from the destination descriptor. */ -@@ -314,5 +363,25 @@ +@@ -314,5 +363,25 @@ u32 au1xxx_get_dma_residue(u32 chanid); void au1xxx_dbdma_chan_free(u32 chanid); void au1xxx_dbdma_dump(u32 chanid); @@ -25389,8 +25389,8 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_dbdma.h #endif /* _AU1000_DBDMA_H_ */ Index: linux-2.4.35.4/include/asm-mips/au1xxx_gpio.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/asm-mips/au1xxx_gpio.h 2007-12-15 05:19:45.022986751 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/asm-mips/au1xxx_gpio.h @@ -0,0 +1,22 @@ + + @@ -25416,8 +25416,8 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_gpio.h +#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 2007-12-15 05:19:44.358948912 +0100 -+++ linux-2.4.35.4/include/asm-mips/au1xxx_psc.h 2007-12-15 05:19:45.022986751 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/au1xxx_psc.h ++++ linux-2.4.35.4/include/asm-mips/au1xxx_psc.h @@ -41,6 +41,11 @@ #define PSC3_BASE_ADDR 0xb0d00000 #endif @@ -25430,7 +25430,7 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_psc.h /* The PSC select and control registers are common to * all protocols. */ -@@ -226,6 +231,8 @@ +@@ -226,6 +231,8 @@ typedef struct psc_i2s { #define PSC_I2SCFG_DD_DISABLE (1 << 27) #define PSC_I2SCFG_DE_ENABLE (1 << 26) #define PSC_I2SCFG_SET_WS(x) (((((x) / 2) - 1) & 0x7f) << 16) @@ -25441,8 +25441,8 @@ Index: linux-2.4.35.4/include/asm-mips/au1xxx_psc.h #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 2007-12-15 05:19:44.366949367 +0100 -+++ linux-2.4.35.4/include/asm-mips/bootinfo.h 2007-12-15 05:19:45.026986980 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/bootinfo.h ++++ linux-2.4.35.4/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 */ @@ -25455,8 +25455,8 @@ Index: linux-2.4.35.4/include/asm-mips/bootinfo.h * Valid machtype for group NEC_VR41XX Index: linux-2.4.35.4/include/asm-mips/db1200.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/asm-mips/db1200.h 2007-12-15 05:19:45.026986980 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/asm-mips/db1200.h @@ -0,0 +1,214 @@ +/* + * AMD Alchemy DB1200 Referrence Board @@ -25674,8 +25674,8 @@ Index: linux-2.4.35.4/include/asm-mips/db1200.h + Index: linux-2.4.35.4/include/asm-mips/db1x00.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/db1x00.h 2007-12-15 05:19:44.378950051 +0100 -+++ linux-2.4.35.4/include/asm-mips/db1x00.h 2007-12-15 05:19:45.026986980 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/db1x00.h ++++ linux-2.4.35.4/include/asm-mips/db1x00.h @@ -1,5 +1,5 @@ /* - * AMD Alchemy DB1x00 Reference Boards @@ -25702,7 +25702,7 @@ Index: linux-2.4.35.4/include/asm-mips/db1x00.h #endif /* -@@ -66,6 +75,7 @@ +@@ -66,6 +75,7 @@ typedef volatile struct } BCSR; @@ -25710,7 +25710,7 @@ Index: linux-2.4.35.4/include/asm-mips/db1x00.h /* * Register/mask bit definitions for the BCSRs -@@ -130,14 +140,6 @@ +@@ -130,14 +140,6 @@ typedef volatile struct #define BCSR_SWRESET_RESET 0x0080 @@ -25725,7 +25725,7 @@ Index: linux-2.4.35.4/include/asm-mips/db1x00.h /* MTD CONFIG OPTIONS */ #if defined(CONFIG_MTD_DB1X00_BOOT) && defined(CONFIG_MTD_DB1X00_USER) #define DB1X00_BOTH_BANKS -@@ -147,48 +149,15 @@ +@@ -147,48 +149,15 @@ typedef volatile struct #define DB1X00_USER_ONLY #endif @@ -25783,9 +25783,9 @@ Index: linux-2.4.35.4/include/asm-mips/db1x00.h Index: linux-2.4.35.4/include/asm-mips/elf.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/elf.h 2007-12-15 05:19:44.386950507 +0100 -+++ linux-2.4.35.4/include/asm-mips/elf.h 2007-12-15 05:19:45.026986980 +0100 -@@ -66,9 +66,10 @@ +--- linux-2.4.35.4.orig/include/asm-mips/elf.h ++++ linux-2.4.35.4/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 @@ -25801,8 +25801,8 @@ Index: linux-2.4.35.4/include/asm-mips/elf.h instruction set this cpu supports. This could be done in userspace, Index: linux-2.4.35.4/include/asm-mips/ficmmp.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/asm-mips/ficmmp.h 2007-12-15 05:19:45.026986980 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/asm-mips/ficmmp.h @@ -0,0 +1,156 @@ +/* + * FIC MMP @@ -25962,8 +25962,8 @@ Index: linux-2.4.35.4/include/asm-mips/ficmmp.h + Index: linux-2.4.35.4/include/asm-mips/hazards.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/hazards.h 2007-12-15 05:19:44.398951191 +0100 -+++ linux-2.4.35.4/include/asm-mips/hazards.h 2007-12-15 05:19:45.030987207 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/hazards.h ++++ linux-2.4.35.4/include/asm-mips/hazards.h @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. @@ -26182,9 +26182,9 @@ Index: linux-2.4.35.4/include/asm-mips/hazards.h #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 2007-12-15 05:19:44.406951647 +0100 -+++ linux-2.4.35.4/include/asm-mips/ide.h 2007-12-15 05:19:45.030987207 +0100 -@@ -32,12 +32,12 @@ +--- linux-2.4.35.4.orig/include/asm-mips/ide.h ++++ linux-2.4.35.4/include/asm-mips/ide.h +@@ -32,12 +32,12 @@ struct ide_ops { extern struct ide_ops *ide_ops; @@ -26199,7 +26199,7 @@ Index: linux-2.4.35.4/include/asm-mips/ide.h { return ide_ops->ide_default_io_base(index); } -@@ -48,7 +48,7 @@ +@@ -48,7 +48,7 @@ static inline void ide_init_hwif_ports(h ide_ops->ide_init_hwif_ports(hw, data_port, ctrl_port, irq); } @@ -26208,7 +26208,7 @@ Index: linux-2.4.35.4/include/asm-mips/ide.h { #ifndef CONFIG_BLK_DEV_IDEPCI hw_regs_t hw; -@@ -68,7 +68,89 @@ +@@ -68,7 +68,89 @@ static __inline__ void ide_init_default_ #define ide_ack_intr(hwif) ((hwif)->hw.ack_intr ? (hwif)->hw.ack_intr(hwif) : 1) #endif @@ -26301,9 +26301,9 @@ Index: linux-2.4.35.4/include/asm-mips/ide.h Index: linux-2.4.35.4/include/asm-mips/io.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/io.h 2007-12-15 05:19:44.414952102 +0100 -+++ linux-2.4.35.4/include/asm-mips/io.h 2007-12-15 05:19:45.030987207 +0100 -@@ -392,7 +392,8 @@ +--- linux-2.4.35.4.orig/include/asm-mips/io.h ++++ linux-2.4.35.4/include/asm-mips/io.h +@@ -392,7 +392,8 @@ static inline unsigned int inl_p(unsigne return __ioswab32(__val); } @@ -26313,7 +26313,7 @@ Index: linux-2.4.35.4/include/asm-mips/io.h { while (count--) { outb(*(u8 *)addr, port); -@@ -408,7 +409,8 @@ +@@ -408,7 +409,8 @@ static inline void __insb(unsigned long } } @@ -26323,7 +26323,7 @@ Index: linux-2.4.35.4/include/asm-mips/io.h { while (count--) { outw(*(u16 *)addr, port); -@@ -424,7 +426,8 @@ +@@ -424,7 +426,8 @@ static inline void __insw(unsigned long } } @@ -26335,9 +26335,9 @@ Index: linux-2.4.35.4/include/asm-mips/io.h 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 2007-12-15 05:19:44.422952557 +0100 -+++ linux-2.4.35.4/include/asm-mips/mipsregs.h 2007-12-15 05:19:45.038987665 +0100 -@@ -757,10 +757,18 @@ +--- linux-2.4.35.4.orig/include/asm-mips/mipsregs.h ++++ linux-2.4.35.4/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) #define read_c0_config3() __read_32bit_c0_register($16, 3) @@ -26356,7 +26356,7 @@ Index: linux-2.4.35.4/include/asm-mips/mipsregs.h /* * The WatchLo register. There may be upto 8 of them. -@@ -874,42 +882,34 @@ +@@ -874,42 +882,34 @@ do { \ */ static inline void tlb_probe(void) { @@ -26401,8 +26401,8 @@ Index: linux-2.4.35.4/include/asm-mips/mipsregs.h /* Index: linux-2.4.35.4/include/asm-mips/mmu_context.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/mmu_context.h 2007-12-15 05:19:44.430953013 +0100 -+++ linux-2.4.35.4/include/asm-mips/mmu_context.h 2007-12-15 05:19:45.038987665 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/mmu_context.h ++++ linux-2.4.35.4/include/asm-mips/mmu_context.h @@ -27,7 +27,7 @@ #define TLBMISS_HANDLER_SETUP_PGD(pgd) \ pgd_current[smp_processor_id()] = (unsigned long)(pgd) @@ -26414,8 +26414,8 @@ Index: linux-2.4.35.4/include/asm-mips/mmu_context.h Index: linux-2.4.35.4/include/asm-mips/pb1100.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/pb1100.h 2007-12-15 05:19:44.438953471 +0100 -+++ linux-2.4.35.4/include/asm-mips/pb1100.h 2007-12-15 05:19:45.038987665 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/pb1100.h ++++ linux-2.4.35.4/include/asm-mips/pb1100.h @@ -1,5 +1,5 @@ /* - * Alchemy Semi PB1100 Referrence Board @@ -26584,8 +26584,8 @@ Index: linux-2.4.35.4/include/asm-mips/pb1100.h + Index: linux-2.4.35.4/include/asm-mips/pb1200.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/asm-mips/pb1200.h 2007-12-15 05:19:45.038987665 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/asm-mips/pb1200.h @@ -0,0 +1,244 @@ +/* + * AMD Alchemy PB1200 Referrence Board @@ -26833,8 +26833,8 @@ Index: linux-2.4.35.4/include/asm-mips/pb1200.h + Index: linux-2.4.35.4/include/asm-mips/pb1550.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/pb1550.h 2007-12-15 05:19:44.450954152 +0100 -+++ linux-2.4.35.4/include/asm-mips/pb1550.h 2007-12-15 05:19:45.042987891 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/pb1550.h ++++ linux-2.4.35.4/include/asm-mips/pb1550.h @@ -30,13 +30,11 @@ #define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX @@ -26850,7 +26850,7 @@ Index: linux-2.4.35.4/include/asm-mips/pb1550.h #define BCSR_PHYS_ADDR 0xAF000000 -@@ -160,9 +158,23 @@ +@@ -160,9 +158,23 @@ static BCSR * const bcsr = (BCSR *)BCSR_ #define NAND_T_SU_SHIFT 8 #define NAND_T_WH_SHIFT 12 @@ -26880,8 +26880,8 @@ Index: linux-2.4.35.4/include/asm-mips/pb1550.h #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 2007-12-15 05:19:44.458954611 +0100 -+++ linux-2.4.35.4/include/asm-mips/reg.h 2007-12-15 05:19:45.042987891 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/reg.h ++++ linux-2.4.35.4/include/asm-mips/reg.h @@ -45,6 +45,9 @@ /* * k0/k1 unsaved @@ -26902,9 +26902,9 @@ Index: linux-2.4.35.4/include/asm-mips/reg.h Index: linux-2.4.35.4/include/asm-mips/sgi/hpc3.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/sgi/hpc3.h 2007-12-15 05:19:44.466955066 +0100 -+++ linux-2.4.35.4/include/asm-mips/sgi/hpc3.h 2007-12-15 05:19:45.042987891 +0100 -@@ -128,26 +128,26 @@ +--- linux-2.4.35.4.orig/include/asm-mips/sgi/hpc3.h ++++ linux-2.4.35.4/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 */ u32 _unused1; /* padding */ @@ -26951,7 +26951,7 @@ Index: linux-2.4.35.4/include/asm-mips/sgi/hpc3.h u32 _unused2[0x1000/4 - 8]; /* padding */ -@@ -221,7 +221,7 @@ +@@ -221,7 +221,7 @@ struct hpc3_regs { #define HPC3_BESTAT_PIDMASK 0x3f700 /* DMA channel parity identifier */ u32 _unused1[0x14000/4 - 5]; /* padding */ @@ -26960,7 +26960,7 @@ Index: linux-2.4.35.4/include/asm-mips/sgi/hpc3.h /* Now direct PIO per-HPC3 peripheral access to external regs. */ volatile u32 scsi0_ext[256]; /* SCSI channel 0 external regs */ u32 _unused2[0x7c00/4]; -@@ -304,7 +304,7 @@ +@@ -304,7 +304,7 @@ struct hpc3_regs { volatile u32 bbram[8192-50-14]; /* Battery backed ram */ }; @@ -26971,8 +26971,8 @@ Index: linux-2.4.35.4/include/asm-mips/sgi/hpc3.h */ Index: linux-2.4.35.4/include/asm-mips/tx4927/tx4927.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/tx4927/tx4927.h 2007-12-15 05:19:44.474955521 +0100 -+++ linux-2.4.35.4/include/asm-mips/tx4927/tx4927.h 2007-12-15 05:19:45.042987891 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/tx4927/tx4927.h ++++ linux-2.4.35.4/include/asm-mips/tx4927/tx4927.h @@ -88,8 +88,8 @@ @@ -27043,9 +27043,9 @@ Index: linux-2.4.35.4/include/asm-mips/tx4927/tx4927.h #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 2007-12-15 05:19:44.482955977 +0100 -+++ linux-2.4.35.4/include/asm-mips/unistd.h 2007-12-15 05:19:45.046988120 +0100 -@@ -760,7 +760,7 @@ +--- linux-2.4.35.4.orig/include/asm-mips/unistd.h ++++ linux-2.4.35.4/include/asm-mips/unistd.h +@@ -760,7 +760,7 @@ type name(void) \ if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27054,7 +27054,7 @@ Index: linux-2.4.35.4/include/asm-mips/unistd.h } /* -@@ -788,7 +788,7 @@ +@@ -788,7 +788,7 @@ type name(atype a) \ if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27063,7 +27063,7 @@ Index: linux-2.4.35.4/include/asm-mips/unistd.h } #define _syscall2(type,name,atype,a,btype,b) \ -@@ -813,7 +813,7 @@ +@@ -813,7 +813,7 @@ type name(atype a, btype b) \ if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27072,7 +27072,7 @@ Index: linux-2.4.35.4/include/asm-mips/unistd.h } #define _syscall3(type,name,atype,a,btype,b,ctype,c) \ -@@ -839,7 +839,7 @@ +@@ -839,7 +839,7 @@ type name(atype a, btype b, ctype c) \ if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27081,7 +27081,7 @@ Index: linux-2.4.35.4/include/asm-mips/unistd.h } #define _syscall4(type,name,atype,a,btype,b,ctype,c,dtype,d) \ -@@ -865,7 +865,7 @@ +@@ -865,7 +865,7 @@ type name(atype a, btype b, ctype c, dty if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27090,7 +27090,7 @@ Index: linux-2.4.35.4/include/asm-mips/unistd.h } #if (_MIPS_SIM == _MIPS_SIM_ABI32) -@@ -902,7 +902,7 @@ +@@ -902,7 +902,7 @@ type name(atype a, btype b, ctype c, dty if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27099,7 +27099,7 @@ Index: linux-2.4.35.4/include/asm-mips/unistd.h } #define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \ -@@ -935,7 +935,7 @@ +@@ -935,7 +935,7 @@ type name(atype a, btype b, ctype c, dty if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27108,7 +27108,7 @@ Index: linux-2.4.35.4/include/asm-mips/unistd.h } #endif /* (_MIPS_SIM == _MIPS_SIM_ABI32) */ -@@ -966,7 +966,7 @@ +@@ -966,7 +966,7 @@ type name (atype a,btype b,ctype c,dtype if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27117,7 +27117,7 @@ Index: linux-2.4.35.4/include/asm-mips/unistd.h } #define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \ -@@ -995,7 +995,7 @@ +@@ -995,7 +995,7 @@ type name (atype a,btype b,ctype c,dtype if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27128,9 +27128,9 @@ Index: linux-2.4.35.4/include/asm-mips/unistd.h #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 2007-12-15 05:19:44.490956432 +0100 -+++ linux-2.4.35.4/include/asm-mips64/checksum.h 2007-12-15 05:19:45.046988120 +0100 -@@ -144,7 +144,7 @@ +--- linux-2.4.35.4.orig/include/asm-mips64/checksum.h ++++ linux-2.4.35.4/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" "daddu\t%0, $1\n\t" @@ -27141,9 +27141,9 @@ Index: linux-2.4.35.4/include/asm-mips64/checksum.h : "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 2007-12-15 05:19:44.498956890 +0100 -+++ linux-2.4.35.4/include/asm-mips64/elf.h 2007-12-15 05:19:45.046988120 +0100 -@@ -64,9 +64,10 @@ +--- linux-2.4.35.4.orig/include/asm-mips64/elf.h ++++ linux-2.4.35.4/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 @@ -27159,8 +27159,8 @@ Index: linux-2.4.35.4/include/asm-mips64/elf.h 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 2007-12-15 05:19:44.506957346 +0100 -+++ linux-2.4.35.4/include/asm-mips64/hazards.h 2007-12-15 05:19:45.046988120 +0100 +--- linux-2.4.35.4.orig/include/asm-mips64/hazards.h ++++ linux-2.4.35.4/include/asm-mips64/hazards.h @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. @@ -27380,9 +27380,9 @@ Index: linux-2.4.35.4/include/asm-mips64/hazards.h #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 2007-12-15 05:19:44.514957801 +0100 -+++ linux-2.4.35.4/include/asm-mips64/ide.h 2007-12-15 05:19:45.050988346 +0100 -@@ -32,12 +32,12 @@ +--- linux-2.4.35.4.orig/include/asm-mips64/ide.h ++++ linux-2.4.35.4/include/asm-mips64/ide.h +@@ -32,12 +32,12 @@ struct ide_ops { extern struct ide_ops *ide_ops; @@ -27397,7 +27397,7 @@ Index: linux-2.4.35.4/include/asm-mips64/ide.h { return ide_ops->ide_default_io_base(index); } -@@ -48,7 +48,7 @@ +@@ -48,7 +48,7 @@ static inline void ide_init_hwif_ports(h ide_ops->ide_init_hwif_ports(hw, data_port, ctrl_port, irq); } @@ -27406,7 +27406,7 @@ Index: linux-2.4.35.4/include/asm-mips64/ide.h { #ifndef CONFIG_BLK_DEV_IDEPCI hw_regs_t hw; -@@ -68,7 +68,89 @@ +@@ -68,7 +68,89 @@ static __inline__ void ide_init_default_ #define ide_ack_intr(hwif) ((hwif)->hw.ack_intr ? (hwif)->hw.ack_intr(hwif) : 1) #endif @@ -27499,9 +27499,9 @@ Index: linux-2.4.35.4/include/asm-mips64/ide.h Index: linux-2.4.35.4/include/asm-mips64/io.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/io.h 2007-12-15 05:19:44.522958256 +0100 -+++ linux-2.4.35.4/include/asm-mips64/io.h 2007-12-15 05:19:45.050988346 +0100 -@@ -414,7 +414,8 @@ +--- linux-2.4.35.4.orig/include/asm-mips64/io.h ++++ linux-2.4.35.4/include/asm-mips64/io.h +@@ -414,7 +414,8 @@ static inline unsigned int inl_p(unsigne return __ioswab32(__val); } @@ -27511,7 +27511,7 @@ Index: linux-2.4.35.4/include/asm-mips64/io.h { while (count--) { outb(*(u8 *)addr, port); -@@ -430,7 +431,8 @@ +@@ -430,7 +431,8 @@ static inline void __insb(unsigned long } } @@ -27521,7 +27521,7 @@ Index: linux-2.4.35.4/include/asm-mips64/io.h { while (count--) { outw(*(u16 *)addr, port); -@@ -446,7 +448,8 @@ +@@ -446,7 +448,8 @@ static inline void __insw(unsigned long } } @@ -27533,9 +27533,9 @@ Index: linux-2.4.35.4/include/asm-mips64/io.h 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 2007-12-15 05:19:44.530958712 +0100 -+++ linux-2.4.35.4/include/asm-mips64/mipsregs.h 2007-12-15 05:19:45.050988346 +0100 -@@ -757,10 +757,18 @@ +--- linux-2.4.35.4.orig/include/asm-mips64/mipsregs.h ++++ linux-2.4.35.4/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) #define read_c0_config3() __read_32bit_c0_register($16, 3) @@ -27554,7 +27554,7 @@ Index: linux-2.4.35.4/include/asm-mips64/mipsregs.h /* * The WatchLo register. There may be upto 8 of them. -@@ -856,42 +864,34 @@ +@@ -856,42 +864,34 @@ do { \ */ static inline void tlb_probe(void) { @@ -27599,8 +27599,8 @@ Index: linux-2.4.35.4/include/asm-mips64/mipsregs.h /* Index: linux-2.4.35.4/include/asm-mips64/reg.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/reg.h 2007-12-15 05:19:44.538959170 +0100 -+++ linux-2.4.35.4/include/asm-mips64/reg.h 2007-12-15 05:19:45.050988346 +0100 +--- linux-2.4.35.4.orig/include/asm-mips64/reg.h ++++ linux-2.4.35.4/include/asm-mips64/reg.h @@ -46,6 +46,9 @@ /* * k0/k1 unsaved @@ -27613,9 +27613,9 @@ Index: linux-2.4.35.4/include/asm-mips64/reg.h #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 2007-12-15 05:19:44.546959625 +0100 -+++ linux-2.4.35.4/include/asm-mips64/sgi/hpc3.h 2007-12-15 05:19:45.050988346 +0100 -@@ -128,26 +128,26 @@ +--- linux-2.4.35.4.orig/include/asm-mips64/sgi/hpc3.h ++++ linux-2.4.35.4/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 */ u32 _unused1; /* padding */ @@ -27662,7 +27662,7 @@ Index: linux-2.4.35.4/include/asm-mips64/sgi/hpc3.h u32 _unused2[0x1000/4 - 8]; /* padding */ -@@ -221,7 +221,7 @@ +@@ -221,7 +221,7 @@ struct hpc3_regs { #define HPC3_BESTAT_PIDMASK 0x3f700 /* DMA channel parity identifier */ u32 _unused1[0x14000/4 - 5]; /* padding */ @@ -27671,7 +27671,7 @@ Index: linux-2.4.35.4/include/asm-mips64/sgi/hpc3.h /* Now direct PIO per-HPC3 peripheral access to external regs. */ volatile u32 scsi0_ext[256]; /* SCSI channel 0 external regs */ u32 _unused2[0x7c00/4]; -@@ -304,7 +304,7 @@ +@@ -304,7 +304,7 @@ struct hpc3_regs { volatile u32 bbram[8192-50-14]; /* Battery backed ram */ }; @@ -27682,8 +27682,8 @@ Index: linux-2.4.35.4/include/asm-mips64/sgi/hpc3.h */ Index: linux-2.4.35.4/include/asm-mips64/sn/nmi.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/sn/nmi.h 2007-12-15 05:19:44.554960080 +0100 -+++ linux-2.4.35.4/include/asm-mips64/sn/nmi.h 2007-12-15 05:19:45.054988575 +0100 +--- linux-2.4.35.4.orig/include/asm-mips64/sn/nmi.h ++++ linux-2.4.35.4/include/asm-mips64/sn/nmi.h @@ -8,7 +8,7 @@ #ifndef __ASM_SN_NMI_H #define __ASM_SN_NMI_H @@ -27695,9 +27695,9 @@ Index: linux-2.4.35.4/include/asm-mips64/sn/nmi.h Index: linux-2.4.35.4/include/asm-mips64/unistd.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips64/unistd.h 2007-12-15 05:19:44.562960536 +0100 -+++ linux-2.4.35.4/include/asm-mips64/unistd.h 2007-12-15 05:19:45.054988575 +0100 -@@ -760,7 +760,7 @@ +--- linux-2.4.35.4.orig/include/asm-mips64/unistd.h ++++ linux-2.4.35.4/include/asm-mips64/unistd.h +@@ -760,7 +760,7 @@ type name(void) \ if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27706,7 +27706,7 @@ Index: linux-2.4.35.4/include/asm-mips64/unistd.h } /* -@@ -788,7 +788,7 @@ +@@ -788,7 +788,7 @@ type name(atype a) \ if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27715,7 +27715,7 @@ Index: linux-2.4.35.4/include/asm-mips64/unistd.h } #define _syscall2(type,name,atype,a,btype,b) \ -@@ -813,7 +813,7 @@ +@@ -813,7 +813,7 @@ type name(atype a, btype b) \ if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27724,7 +27724,7 @@ Index: linux-2.4.35.4/include/asm-mips64/unistd.h } #define _syscall3(type,name,atype,a,btype,b,ctype,c) \ -@@ -839,7 +839,7 @@ +@@ -839,7 +839,7 @@ type name(atype a, btype b, ctype c) \ if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27733,7 +27733,7 @@ Index: linux-2.4.35.4/include/asm-mips64/unistd.h } #define _syscall4(type,name,atype,a,btype,b,ctype,c,dtype,d) \ -@@ -865,7 +865,7 @@ +@@ -865,7 +865,7 @@ type name(atype a, btype b, ctype c, dty if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27742,7 +27742,7 @@ Index: linux-2.4.35.4/include/asm-mips64/unistd.h } #if (_MIPS_SIM == _MIPS_SIM_ABI32) -@@ -902,7 +902,7 @@ +@@ -902,7 +902,7 @@ type name(atype a, btype b, ctype c, dty if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27751,7 +27751,7 @@ Index: linux-2.4.35.4/include/asm-mips64/unistd.h } #define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \ -@@ -935,7 +935,7 @@ +@@ -935,7 +935,7 @@ type name(atype a, btype b, ctype c, dty if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27760,7 +27760,7 @@ Index: linux-2.4.35.4/include/asm-mips64/unistd.h } #endif /* (_MIPS_SIM == _MIPS_SIM_ABI32) */ -@@ -966,7 +966,7 @@ +@@ -966,7 +966,7 @@ type name (atype a,btype b,ctype c,dtype if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27769,7 +27769,7 @@ Index: linux-2.4.35.4/include/asm-mips64/unistd.h } #define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \ -@@ -995,7 +995,7 @@ +@@ -995,7 +995,7 @@ type name (atype a,btype b,ctype c,dtype if (__a3 == 0) \ return (type) __v0; \ errno = __v0; \ @@ -27780,8 +27780,8 @@ Index: linux-2.4.35.4/include/asm-mips64/unistd.h #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 2007-12-15 05:19:44.570960991 +0100 -+++ linux-2.4.35.4/include/asm-ppc/param.h 2007-12-15 05:19:45.054988575 +0100 +--- linux-2.4.35.4.orig/include/asm-ppc/param.h ++++ linux-2.4.35.4/include/asm-ppc/param.h @@ -3,6 +3,9 @@ #ifndef HZ @@ -27794,8 +27794,8 @@ Index: linux-2.4.35.4/include/asm-ppc/param.h #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 2007-12-15 05:19:44.578961449 +0100 -+++ linux-2.4.35.4/include/asm-s390/param.h 2007-12-15 05:19:45.054988575 +0100 +--- linux-2.4.35.4.orig/include/asm-s390/param.h ++++ linux-2.4.35.4/include/asm-s390/param.h @@ -11,6 +11,9 @@ #ifndef HZ @@ -27808,8 +27808,8 @@ Index: linux-2.4.35.4/include/asm-s390/param.h #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 2007-12-15 05:19:44.590962131 +0100 -+++ linux-2.4.35.4/include/asm-sh/param.h 2007-12-15 05:19:45.054988575 +0100 +--- linux-2.4.35.4.orig/include/asm-sh/param.h ++++ linux-2.4.35.4/include/asm-sh/param.h @@ -3,6 +3,9 @@ #ifndef HZ @@ -27822,8 +27822,8 @@ Index: linux-2.4.35.4/include/asm-sh/param.h #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 2007-12-15 05:19:44.598962589 +0100 -+++ linux-2.4.35.4/include/asm-sparc/param.h 2007-12-15 05:19:45.058988805 +0100 +--- linux-2.4.35.4.orig/include/asm-sparc/param.h ++++ linux-2.4.35.4/include/asm-sparc/param.h @@ -4,6 +4,9 @@ #ifndef HZ @@ -27836,8 +27836,8 @@ Index: linux-2.4.35.4/include/asm-sparc/param.h #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 2007-12-15 05:19:44.606963045 +0100 -+++ linux-2.4.35.4/include/asm-sparc64/param.h 2007-12-15 05:19:45.058988805 +0100 +--- linux-2.4.35.4.orig/include/asm-sparc64/param.h ++++ linux-2.4.35.4/include/asm-sparc64/param.h @@ -4,6 +4,9 @@ #ifndef HZ @@ -27850,8 +27850,8 @@ Index: linux-2.4.35.4/include/asm-sparc64/param.h #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 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/i2c-algo-au1550.h 2007-12-15 05:19:45.058988805 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/i2c-algo-au1550.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2004 Embedded Edge, LLC <dan@embeddededge.com> @@ -27886,8 +27886,8 @@ Index: linux-2.4.35.4/include/linux/i2c-algo-au1550.h +#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 2007-12-15 05:19:44.618963729 +0100 -+++ linux-2.4.35.4/include/linux/i2c-id.h 2007-12-15 05:19:45.062989031 +0100 +--- linux-2.4.35.4.orig/include/linux/i2c-id.h ++++ linux-2.4.35.4/include/linux/i2c-id.h @@ -155,6 +155,8 @@ #define I2C_ALGO_SIBYTE 0x150000 /* Broadcom SiByte SOCs */ #define I2C_ALGO_SGI 0x160000 /* SGI algorithm */ @@ -27909,9 +27909,9 @@ Index: linux-2.4.35.4/include/linux/i2c-id.h #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 2007-12-15 05:19:44.626964184 +0100 -+++ linux-2.4.35.4/include/linux/sched.h 2007-12-15 05:19:45.066989260 +0100 -@@ -617,6 +617,10 @@ +--- linux-2.4.35.4.orig/include/linux/sched.h ++++ linux-2.4.35.4/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); @@ -27924,9 +27924,9 @@ Index: linux-2.4.35.4/include/linux/sched.h 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 2007-12-15 05:19:44.634964640 +0100 -+++ linux-2.4.35.4/include/linux/serial.h 2007-12-15 05:19:45.066989260 +0100 -@@ -75,7 +75,8 @@ +--- linux-2.4.35.4.orig/include/linux/serial.h ++++ linux-2.4.35.4/include/linux/serial.h +@@ -75,7 +75,8 @@ struct serial_struct { #define PORT_16654 11 #define PORT_16850 12 #define PORT_RSA 13 /* RSA-DV II/S card */ @@ -27938,8 +27938,8 @@ Index: linux-2.4.35.4/include/linux/serial.h #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 2007-12-15 05:19:44.642965095 +0100 -+++ linux-2.4.35.4/include/linux/swap.h 2007-12-15 05:19:45.066989260 +0100 +--- linux-2.4.35.4.orig/include/linux/swap.h ++++ linux-2.4.35.4/include/linux/swap.h @@ -1,6 +1,12 @@ #ifndef _LINUX_SWAP_H #define _LINUX_SWAP_H @@ -27962,7 +27962,7 @@ Index: linux-2.4.35.4/include/linux/swap.h /* * Magic header for a swap area. The first part of the union is * what the swap magic looks like for the old (limited to 128MB) -@@ -39,8 +43,6 @@ +@@ -39,8 +43,6 @@ union swap_header { } info; }; @@ -27973,9 +27973,9 @@ Index: linux-2.4.35.4/include/linux/swap.h */ Index: linux-2.4.35.4/include/video/newport.h =================================================================== ---- linux-2.4.35.4.orig/include/video/newport.h 2007-12-15 05:19:44.650965550 +0100 -+++ linux-2.4.35.4/include/video/newport.h 2007-12-15 05:19:45.066989260 +0100 -@@ -291,8 +291,6 @@ +--- linux-2.4.35.4.orig/include/video/newport.h ++++ linux-2.4.35.4/include/video/newport.h +@@ -291,8 +291,6 @@ struct newport_regs { unsigned int _unused2[0x1ef]; struct newport_cregs cgo; }; @@ -27984,7 +27984,7 @@ Index: linux-2.4.35.4/include/video/newport.h typedef struct { unsigned int drawmode1; -@@ -450,38 +448,26 @@ +@@ -450,38 +448,26 @@ static __inline__ void newport_cmap_setr /* Miscellaneous NEWPORT routines. */ #define BUSY_TIMEOUT 100000 @@ -28033,7 +28033,7 @@ Index: linux-2.4.35.4/include/video/newport.h /* * DCBMODE register defines: */ -@@ -564,7 +550,7 @@ +@@ -564,7 +550,7 @@ xmap9FIFOWait (struct newport_regs *rex) { rex->set.dcbmode = DCB_XMAP0 | XM9_CRS_FIFO_AVAIL | DCB_DATAWIDTH_1 | R_DCB_XMAP9_PROTOCOL; @@ -28044,9 +28044,9 @@ Index: linux-2.4.35.4/include/video/newport.h ; Index: linux-2.4.35.4/init/main.c =================================================================== ---- linux-2.4.35.4.orig/init/main.c 2007-12-15 05:19:44.662966235 +0100 -+++ linux-2.4.35.4/init/main.c 2007-12-15 05:19:45.070989486 +0100 -@@ -296,7 +296,6 @@ +--- linux-2.4.35.4.orig/init/main.c ++++ linux-2.4.35.4/init/main.c +@@ -296,7 +296,6 @@ static void __init parse_options(char *l extern void setup_arch(char **); @@ -28056,9 +28056,9 @@ Index: linux-2.4.35.4/init/main.c Index: linux-2.4.35.4/kernel/exit.c =================================================================== ---- linux-2.4.35.4.orig/kernel/exit.c 2007-12-15 05:19:44.666966464 +0100 -+++ linux-2.4.35.4/kernel/exit.c 2007-12-15 05:19:45.070989486 +0100 -@@ -26,7 +26,7 @@ +--- linux-2.4.35.4.orig/kernel/exit.c ++++ linux-2.4.35.4/kernel/exit.c +@@ -26,7 +26,7 @@ extern struct task_struct *child_reaper; int getrusage(struct task_struct *, int, struct rusage *); @@ -28069,8 +28069,8 @@ Index: linux-2.4.35.4/kernel/exit.c #ifdef CONFIG_SMP Index: linux-2.4.35.4/kernel/signal.c =================================================================== ---- linux-2.4.35.4.orig/kernel/signal.c 2007-12-15 05:19:44.674966919 +0100 -+++ linux-2.4.35.4/kernel/signal.c 2007-12-15 05:19:45.070989486 +0100 +--- linux-2.4.35.4.orig/kernel/signal.c ++++ linux-2.4.35.4/kernel/signal.c @@ -14,6 +14,7 @@ #include <linux/init.h> #include <linux/sched.h> @@ -28094,7 +28094,7 @@ Index: linux-2.4.35.4/kernel/signal.c static kmem_cache_t *sigqueue_cachep; atomic_t nr_queued_signals; -@@ -270,6 +279,11 @@ +@@ -270,6 +279,11 @@ printk("SIG dequeue (%s:%d): %d ", curre signal_pending(current)); #endif @@ -28106,7 +28106,7 @@ Index: linux-2.4.35.4/kernel/signal.c sig = next_signal(current, mask); if (sig) { if (current->notifier) { -@@ -293,6 +307,10 @@ +@@ -293,6 +307,10 @@ printk("SIG dequeue (%s:%d): %d ", curre printk(" %d -> %d\n", signal_pending(current), sig); #endif @@ -28117,7 +28117,7 @@ Index: linux-2.4.35.4/kernel/signal.c return sig; } -@@ -540,6 +558,11 @@ +@@ -540,6 +558,11 @@ send_sig_info(int sig, struct siginfo *i printk("SIG queue (%s:%d): %d ", t->comm, t->pid, sig); #endif @@ -28129,7 +28129,7 @@ Index: linux-2.4.35.4/kernel/signal.c ret = -EINVAL; if (sig < 0 || sig > _NSIG) goto out_nolock; -@@ -778,8 +801,8 @@ +@@ -778,8 +801,8 @@ void do_notify_parent(struct task_struct info.si_uid = tsk->uid; /* FIXME: find out whether or not this is supposed to be c*time. */ @@ -28142,9 +28142,9 @@ Index: linux-2.4.35.4/kernel/signal.c why = SI_KERNEL; /* shouldn't happen */ Index: linux-2.4.35.4/kernel/sys.c =================================================================== ---- linux-2.4.35.4.orig/kernel/sys.c 2007-12-15 05:19:44.682967375 +0100 -+++ linux-2.4.35.4/kernel/sys.c 2007-12-15 05:19:45.074989715 +0100 -@@ -801,16 +801,23 @@ +--- linux-2.4.35.4.orig/kernel/sys.c ++++ linux-2.4.35.4/kernel/sys.c +@@ -801,16 +801,23 @@ asmlinkage long sys_setfsgid(gid_t gid) asmlinkage long sys_times(struct tms * tbuf) { @@ -28173,9 +28173,9 @@ Index: linux-2.4.35.4/kernel/sys.c /* Index: linux-2.4.35.4/lib/Makefile =================================================================== ---- linux-2.4.35.4.orig/lib/Makefile 2007-12-15 05:19:44.694968059 +0100 -+++ linux-2.4.35.4/lib/Makefile 2007-12-15 05:19:45.074989715 +0100 -@@ -27,6 +27,7 @@ +--- linux-2.4.35.4.orig/lib/Makefile ++++ linux-2.4.35.4/lib/Makefile +@@ -27,6 +27,7 @@ obj-$(CONFIG_CRC32) += crc32.o subdir-$(CONFIG_ZLIB_INFLATE) += zlib_inflate subdir-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate @@ -28185,9 +28185,9 @@ Index: linux-2.4.35.4/lib/Makefile include $(TOPDIR)/drivers/bluetooth/Makefile.lib Index: linux-2.4.35.4/Makefile =================================================================== ---- linux-2.4.35.4.orig/Makefile 2007-12-15 05:19:44.702968514 +0100 -+++ linux-2.4.35.4/Makefile 2007-12-15 05:19:45.074989715 +0100 -@@ -469,10 +469,11 @@ +--- linux-2.4.35.4.orig/Makefile ++++ linux-2.4.35.4/Makefile +@@ -469,10 +469,11 @@ mrproper: clean archmrproper $(MAKE) -C Documentation/DocBook mrproper distclean: mrproper @@ -28203,7 +28203,7 @@ Index: linux-2.4.35.4/Makefile backup: mrproper cd .. && tar cf - linux/ | gzip -9 > backup.gz -@@ -499,7 +500,7 @@ +@@ -499,7 +500,7 @@ mandocs: $(MAKE) -C Documentation/DocBook man sums: diff --git a/target/linux/generic-2.4/patches/001-squashfs.patch b/target/linux/generic-2.4/patches/001-squashfs.patch index e6751fd1d0..4ebfb7575e 100644 --- a/target/linux/generic-2.4/patches/001-squashfs.patch +++ b/target/linux/generic-2.4/patches/001-squashfs.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/fs/Config.in =================================================================== ---- linux-2.4.35.4.orig/fs/Config.in 2007-12-15 05:19:42.758857728 +0100 -+++ linux-2.4.35.4/fs/Config.in 2007-12-15 05:19:48.635192599 +0100 -@@ -51,6 +51,14 @@ +--- linux-2.4.35.4.orig/fs/Config.in ++++ linux-2.4.35.4/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 tristate 'Compressed ROM file system support' CONFIG_CRAMFS @@ -19,9 +19,9 @@ Index: linux-2.4.35.4/fs/Config.in Index: linux-2.4.35.4/fs/Makefile =================================================================== ---- linux-2.4.35.4.orig/fs/Makefile 2007-12-15 05:19:42.766858183 +0100 -+++ linux-2.4.35.4/fs/Makefile 2007-12-15 05:19:48.639192828 +0100 -@@ -65,6 +65,7 @@ +--- linux-2.4.35.4.orig/fs/Makefile ++++ linux-2.4.35.4/fs/Makefile +@@ -65,6 +65,7 @@ subdir-$(CONFIG_REISERFS_FS) += reiserfs subdir-$(CONFIG_DEVPTS_FS) += devpts subdir-$(CONFIG_SUN_OPENPROMFS) += openpromfs subdir-$(CONFIG_BEFS_FS) += befs @@ -31,8 +31,8 @@ Index: linux-2.4.35.4/fs/Makefile Index: linux-2.4.35.4/fs/squashfs/inode.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/squashfs/inode.c 2007-12-15 05:19:48.647193283 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/squashfs/inode.c @@ -0,0 +1,2028 @@ +/* + * Squashfs - a compressed read only filesystem for Linux @@ -2064,8 +2064,8 @@ Index: linux-2.4.35.4/fs/squashfs/inode.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/fs/squashfs/Makefile =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/squashfs/Makefile 2007-12-15 05:19:48.651193513 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/squashfs/Makefile @@ -0,0 +1,11 @@ +# +# Makefile for the linux squashfs routines. @@ -2080,8 +2080,8 @@ Index: linux-2.4.35.4/fs/squashfs/Makefile +include $(TOPDIR)/Rules.make Index: linux-2.4.35.4/fs/squashfs/squashfs2_0.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/squashfs/squashfs2_0.c 2007-12-15 05:19:48.655193739 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/squashfs/squashfs2_0.c @@ -0,0 +1,751 @@ +/* + * Squashfs - a compressed read only filesystem for Linux @@ -2836,8 +2836,8 @@ Index: linux-2.4.35.4/fs/squashfs/squashfs2_0.c +} Index: linux-2.4.35.4/fs/squashfs/squashfs.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/squashfs/squashfs.h 2007-12-15 05:19:48.659193968 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/squashfs/squashfs.h @@ -0,0 +1,85 @@ +/* + * Squashfs - a compressed read only filesystem for Linux @@ -2926,9 +2926,9 @@ Index: linux-2.4.35.4/fs/squashfs/squashfs.h +#endif Index: linux-2.4.35.4/include/linux/fs.h =================================================================== ---- linux-2.4.35.4.orig/include/linux/fs.h 2007-12-15 05:19:42.794859778 +0100 -+++ linux-2.4.35.4/include/linux/fs.h 2007-12-15 05:19:48.663194197 +0100 -@@ -324,6 +324,7 @@ +--- linux-2.4.35.4.orig/include/linux/fs.h ++++ linux-2.4.35.4/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> #include <linux/cramfs_fs_sb.h> @@ -2936,7 +2936,7 @@ Index: linux-2.4.35.4/include/linux/fs.h /* * Attribute flags. These should be or-ed together to figure out what -@@ -519,6 +520,7 @@ +@@ -519,6 +520,7 @@ struct inode { struct socket socket_i; struct usbdev_inode_info usbdev_i; struct jffs2_inode_info jffs2_i; @@ -2944,7 +2944,7 @@ Index: linux-2.4.35.4/include/linux/fs.h void *generic_ip; } u; }; -@@ -734,6 +736,7 @@ +@@ -734,6 +736,7 @@ struct nameidata { #include <linux/usbdev_fs_sb.h> #include <linux/cramfs_fs_sb.h> #include <linux/jffs2_fs_sb.h> @@ -2952,7 +2952,7 @@ Index: linux-2.4.35.4/include/linux/fs.h extern struct list_head super_blocks; extern spinlock_t sb_lock; -@@ -793,6 +796,7 @@ +@@ -793,6 +796,7 @@ struct super_block { struct usbdev_sb_info usbdevfs_sb; struct jffs2_sb_info jffs2_sb; struct cramfs_sb_info cramfs_sb; @@ -2962,8 +2962,8 @@ Index: linux-2.4.35.4/include/linux/fs.h /* Index: linux-2.4.35.4/include/linux/squashfs_fs.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/squashfs_fs.h 2007-12-15 05:19:48.663194197 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/squashfs_fs.h @@ -0,0 +1,915 @@ +#ifndef SQUASHFS_FS +#define SQUASHFS_FS @@ -3882,8 +3882,8 @@ Index: linux-2.4.35.4/include/linux/squashfs_fs.h +#endif Index: linux-2.4.35.4/include/linux/squashfs_fs_i.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/squashfs_fs_i.h 2007-12-15 05:19:48.663194197 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/squashfs_fs_i.h @@ -0,0 +1,44 @@ +#ifndef SQUASHFS_FS_I +#define SQUASHFS_FS_I @@ -3931,8 +3931,8 @@ Index: linux-2.4.35.4/include/linux/squashfs_fs_i.h +#endif Index: linux-2.4.35.4/include/linux/squashfs_fs_sb.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/squashfs_fs_sb.h 2007-12-15 05:19:48.667194423 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/squashfs_fs_sb.h @@ -0,0 +1,74 @@ +#ifndef SQUASHFS_FS_SB +#define SQUASHFS_FS_SB @@ -4010,8 +4010,8 @@ Index: linux-2.4.35.4/include/linux/squashfs_fs_sb.h +#endif Index: linux-2.4.35.4/init/do_mounts.c =================================================================== ---- linux-2.4.35.4.orig/init/do_mounts.c 2007-12-15 05:19:42.822861373 +0100 -+++ linux-2.4.35.4/init/do_mounts.c 2007-12-15 05:19:48.667194423 +0100 +--- linux-2.4.35.4.orig/init/do_mounts.c ++++ linux-2.4.35.4/init/do_mounts.c @@ -15,6 +15,7 @@ #include <linux/minix_fs.h> #include <linux/ext2_fs.h> @@ -4020,7 +4020,7 @@ Index: linux-2.4.35.4/init/do_mounts.c #include <linux/cramfs_fs.h> #define BUILD_CRAMDISK -@@ -476,6 +477,7 @@ +@@ -476,6 +477,7 @@ static int __init crd_load(int in_fd, in * minix * ext2 * romfs @@ -4028,7 +4028,7 @@ Index: linux-2.4.35.4/init/do_mounts.c * cramfs * gzip */ -@@ -486,6 +488,7 @@ +@@ -486,6 +488,7 @@ identify_ramdisk_image(int fd, int start struct minix_super_block *minixsb; struct ext2_super_block *ext2sb; struct romfs_super_block *romfsb; @@ -4036,7 +4036,7 @@ Index: linux-2.4.35.4/init/do_mounts.c struct cramfs_super *cramfsb; int nblocks = -1; unsigned char *buf; -@@ -497,6 +500,7 @@ +@@ -497,6 +500,7 @@ identify_ramdisk_image(int fd, int start minixsb = (struct minix_super_block *) buf; ext2sb = (struct ext2_super_block *) buf; romfsb = (struct romfs_super_block *) buf; @@ -4044,7 +4044,7 @@ Index: linux-2.4.35.4/init/do_mounts.c cramfsb = (struct cramfs_super *) buf; memset(buf, 0xe5, size); -@@ -535,6 +539,15 @@ +@@ -535,6 +539,15 @@ identify_ramdisk_image(int fd, int start goto done; } @@ -4062,9 +4062,9 @@ Index: linux-2.4.35.4/init/do_mounts.c */ Index: linux-2.4.35.4/lib/Config.in =================================================================== ---- linux-2.4.35.4.orig/lib/Config.in 2007-12-15 05:19:42.830861829 +0100 -+++ linux-2.4.35.4/lib/Config.in 2007-12-15 05:19:48.667194423 +0100 -@@ -10,6 +10,7 @@ +--- linux-2.4.35.4.orig/lib/Config.in ++++ linux-2.4.35.4/lib/Config.in +@@ -10,6 +10,7 @@ tristate 'CRC32 functions' CONFIG_CRC32 # Do we need the compression support? # if [ "$CONFIG_CRAMFS" = "y" -o \ @@ -4072,7 +4072,7 @@ Index: linux-2.4.35.4/lib/Config.in "$CONFIG_PPP_DEFLATE" = "y" -o \ "$CONFIG_CRYPTO_DEFLATE" = "y" -o \ "$CONFIG_JFFS2_FS" = "y" -o \ -@@ -17,6 +18,7 @@ +@@ -17,6 +18,7 @@ if [ "$CONFIG_CRAMFS" = "y" -o \ define_tristate CONFIG_ZLIB_INFLATE y else if [ "$CONFIG_CRAMFS" = "m" -o \ diff --git a/target/linux/generic-2.4/patches/002-squashfs_lzma.patch b/target/linux/generic-2.4/patches/002-squashfs_lzma.patch index 82bb91aaef..1509ea536e 100644 --- a/target/linux/generic-2.4/patches/002-squashfs_lzma.patch +++ b/target/linux/generic-2.4/patches/002-squashfs_lzma.patch @@ -1,7 +1,7 @@ Index: linux-2.4.35.4/fs/squashfs/inode.c =================================================================== ---- linux-2.4.35.4.orig/fs/squashfs/inode.c 2007-12-15 05:19:48.647193283 +0100 -+++ linux-2.4.35.4/fs/squashfs/inode.c 2007-12-15 05:19:49.015214255 +0100 +--- linux-2.4.35.4.orig/fs/squashfs/inode.c ++++ linux-2.4.35.4/fs/squashfs/inode.c @@ -4,6 +4,9 @@ * Copyright (c) 2002, 2003, 2004, 2005, 2006 * Phillip Lougher <phillip@lougher.org.uk> @@ -41,7 +41,7 @@ Index: linux-2.4.35.4/fs/squashfs/inode.c static struct super_block *squashfs_read_super(struct super_block *, void *, int); static void squashfs_put_super(struct super_block *); static int squashfs_statfs(struct super_block *, struct statfs *); -@@ -53,7 +71,11 @@ +@@ -53,7 +71,11 @@ static long long read_blocklist(struct i int readahead_blks, char *block_list, unsigned short **block_p, unsigned int *bsize); @@ -53,7 +53,7 @@ Index: linux-2.4.35.4/fs/squashfs/inode.c static DECLARE_FSTYPE_DEV(squashfs_fs_type, "squashfs", squashfs_read_super); -@@ -229,6 +251,15 @@ +@@ -229,6 +251,15 @@ SQSH_EXTERN unsigned int squashfs_read_d if (compressed) { int zlib_err; @@ -69,7 +69,7 @@ Index: linux-2.4.35.4/fs/squashfs/inode.c stream.next_in = c_buffer; stream.avail_in = c_byte; stream.next_out = buffer; -@@ -243,6 +274,7 @@ +@@ -243,6 +274,7 @@ SQSH_EXTERN unsigned int squashfs_read_d bytes = 0; } else bytes = stream.total_out; @@ -77,7 +77,7 @@ Index: linux-2.4.35.4/fs/squashfs/inode.c up(&msblk->read_data_mutex); } -@@ -2004,17 +2036,21 @@ +@@ -2004,17 +2036,21 @@ static int __init init_squashfs_fs(void) printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) " "Phillip Lougher\n"); @@ -101,8 +101,8 @@ Index: linux-2.4.35.4/fs/squashfs/inode.c Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/squashfs/LzmaDecode.c 2007-12-15 05:19:49.019214484 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/squashfs/LzmaDecode.c @@ -0,0 +1,663 @@ +/* + LzmaDecode.c @@ -769,8 +769,8 @@ Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.c +} Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/squashfs/LzmaDecode.h 2007-12-15 05:19:49.027214939 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/squashfs/LzmaDecode.h @@ -0,0 +1,100 @@ +/* + LzmaDecode.h @@ -874,8 +874,8 @@ Index: linux-2.4.35.4/fs/squashfs/LzmaDecode.h +#endif Index: linux-2.4.35.4/fs/squashfs/Makefile =================================================================== ---- linux-2.4.35.4.orig/fs/squashfs/Makefile 2007-12-15 05:19:48.651193513 +0100 -+++ linux-2.4.35.4/fs/squashfs/Makefile 2007-12-15 05:19:49.031215169 +0100 +--- linux-2.4.35.4.orig/fs/squashfs/Makefile ++++ linux-2.4.35.4/fs/squashfs/Makefile @@ -4,7 +4,7 @@ O_TARGET := squashfs.o diff --git a/target/linux/generic-2.4/patches/003-jffs2_compression.patch b/target/linux/generic-2.4/patches/003-jffs2_compression.patch index bb2d03c7b8..aa7ab8f2c1 100644 --- a/target/linux/generic-2.4/patches/003-jffs2_compression.patch +++ b/target/linux/generic-2.4/patches/003-jffs2_compression.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help =================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:19:42.546845646 +0100 -+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:19:49.287229757 +0100 -@@ -17580,6 +17580,32 @@ +--- linux-2.4.35.4.orig/Documentation/Configure.help ++++ linux-2.4.35.4/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. @@ -37,9 +37,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help 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 2007-12-15 05:19:48.635192599 +0100 -+++ linux-2.4.35.4/fs/Config.in 2007-12-15 05:19:49.287229757 +0100 -@@ -50,6 +50,12 @@ +--- linux-2.4.35.4.orig/fs/Config.in ++++ linux-2.4.35.4/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 fi @@ -54,8 +54,8 @@ Index: linux-2.4.35.4/fs/Config.in if [ "$CONFIG_SQUASHFS" = "y" -o "$CONFIG_SQUASHFS" = "m" ] ; then Index: linux-2.4.35.4/fs/jffs2/Config.in.bbc.inc =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/jffs2/Config.in.bbc.inc 2007-12-15 05:19:49.295230212 +0100 +--- /dev/null ++++ linux-2.4.35.4/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 @@ -64,8 +64,8 @@ Index: linux-2.4.35.4/fs/jffs2/Config.in.bbc.inc +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 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/jffs2/Configure.help.bbc.inc 2007-12-15 05:19:49.299230441 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/jffs2/Configure.help.bbc.inc @@ -0,0 +1,25 @@ +ARMLIB compression support for BBC (EXPERIMENTAL) +CONFIG_JFFS2_BBC_ARMLIB @@ -94,8 +94,8 @@ Index: linux-2.4.35.4/fs/jffs2/Configure.help.bbc.inc + was included just for testing) Index: linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc 2007-12-15 05:19:49.303230670 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc @@ -0,0 +1,40 @@ +config JFFS2_BBC_ARMLIB + bool "ARMLIB compression support for BBC (EXPERIMENTAL)" @@ -139,8 +139,8 @@ Index: linux-2.4.35.4/fs/jffs2/Kconfig.bbc.inc + was included just for testing) Index: linux-2.4.35.4/fs/jffs2/Makefile =================================================================== ---- linux-2.4.35.4.orig/fs/jffs2/Makefile 2007-12-15 05:19:42.578847470 +0100 -+++ linux-2.4.35.4/fs/jffs2/Makefile 2007-12-15 05:19:49.307230896 +0100 +--- linux-2.4.35.4.orig/fs/jffs2/Makefile ++++ linux-2.4.35.4/fs/jffs2/Makefile @@ -10,9 +10,23 @@ # Note 2! The CFLAGS definitions are now in the main makefile... @@ -167,8 +167,8 @@ Index: linux-2.4.35.4/fs/jffs2/Makefile Index: linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc 2007-12-15 05:19:49.307230896 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc @@ -0,0 +1,12 @@ +JFFS2_BBC_KERNEL_OBJS-y = jffs2_bbc_framework.o jffs2_bbc_fs.o + @@ -184,9 +184,9 @@ Index: linux-2.4.35.4/fs/jffs2/Makefile.bbc.inc + 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 2007-12-15 05:19:42.590848151 +0100 -+++ linux-2.4.35.4/fs/jffs2/compr_zlib.c 2007-12-15 05:19:49.307230896 +0100 -@@ -85,7 +85,7 @@ +--- linux-2.4.35.4.orig/fs/jffs2/compr_zlib.c ++++ linux-2.4.35.4/fs/jffs2/compr_zlib.c +@@ -85,7 +85,7 @@ void jffs2_zlib_exit(void) vfree(inflate_workspace); } @@ -195,7 +195,7 @@ Index: linux-2.4.35.4/fs/jffs2/compr_zlib.c __u32 *sourcelen, __u32 *dstlen) { z_stream strm; -@@ -145,7 +145,7 @@ +@@ -145,7 +145,7 @@ int zlib_compress(unsigned char *data_in return 0; } @@ -204,7 +204,7 @@ Index: linux-2.4.35.4/fs/jffs2/compr_zlib.c __u32 srclen, __u32 destlen) { z_stream strm; -@@ -175,3 +175,19 @@ +@@ -175,3 +175,19 @@ void zlib_decompress(unsigned char *data zlib_inflateEnd(&strm); up(&inflate_sem); } @@ -226,8 +226,8 @@ Index: linux-2.4.35.4/fs/jffs2/compr_zlib.c + Index: linux-2.4.35.4/fs/jffs2/file.c =================================================================== ---- linux-2.4.35.4.orig/fs/jffs2/file.c 2007-12-15 05:19:42.594848380 +0100 -+++ linux-2.4.35.4/fs/jffs2/file.c 2007-12-15 05:19:49.307230896 +0100 +--- linux-2.4.35.4.orig/fs/jffs2/file.c ++++ linux-2.4.35.4/fs/jffs2/file.c @@ -35,6 +35,7 @@ * */ @@ -236,7 +236,7 @@ Index: linux-2.4.35.4/fs/jffs2/file.c #include <linux/kernel.h> #include <linux/mtd/compatmac.h> /* for min() */ #include <linux/slab.h> -@@ -459,6 +460,7 @@ +@@ -459,6 +460,7 @@ int jffs2_commit_write (struct file *fil comprbuf = kmalloc(cdatalen, GFP_KERNEL); if (comprbuf) { @@ -246,8 +246,8 @@ Index: linux-2.4.35.4/fs/jffs2/file.c 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 2007-12-15 05:19:42.602848836 +0100 -+++ linux-2.4.35.4/fs/jffs2/gc.c 2007-12-15 05:19:49.311231126 +0100 +--- linux-2.4.35.4.orig/fs/jffs2/gc.c ++++ linux-2.4.35.4/fs/jffs2/gc.c @@ -35,6 +35,7 @@ * */ @@ -256,7 +256,7 @@ Index: linux-2.4.35.4/fs/jffs2/gc.c #include <linux/kernel.h> #include <linux/mtd/mtd.h> #include <linux/slab.h> -@@ -651,6 +652,7 @@ +@@ -651,6 +652,7 @@ static int jffs2_garbage_collect_dnode(s writebuf = pg_ptr + (offset & (PAGE_CACHE_SIZE -1)); if (comprbuf) { @@ -266,8 +266,8 @@ Index: linux-2.4.35.4/fs/jffs2/gc.c if (comprtype) { Index: linux-2.4.35.4/fs/jffs2/hpatch =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/jffs2/hpatch 2007-12-15 05:19:49.311231126 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/jffs2/hpatch @@ -0,0 +1,191 @@ +#!/usr/bin/perl +# A patch-like utility @@ -462,8 +462,8 @@ Index: linux-2.4.35.4/fs/jffs2/hpatch +close(CMD); Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c 2007-12-15 05:19:49.311231126 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c @@ -0,0 +1,2224 @@ +/* + * JFFS2-BBC: armlib compressor plugin @@ -2691,8 +2691,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_armlib_comp.c +/*END OF ARMLIB*/ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c 2007-12-15 05:19:49.315231352 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c @@ -0,0 +1,1324 @@ +/* + * JFFS2-BBC: Compression Framework @@ -4020,8 +4020,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.c +#endif Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h 2007-12-15 05:19:49.315231352 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h @@ -0,0 +1,202 @@ +/* + * JFFS2-BBC: Compression Framework - headers @@ -4227,8 +4227,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_framework.h +#endif Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c 2007-12-15 05:19:49.315231352 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c @@ -0,0 +1,331 @@ +/* + * JFFS2-BBC: File System Extension for Linux Kernel @@ -4563,8 +4563,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.c +} Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h 2007-12-15 05:19:49.315231352 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h @@ -0,0 +1,30 @@ +/* + * JFFS2 BBC: File System Extension for Linux Kernel - headers @@ -4598,8 +4598,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_fs.h +void jffs2_bbc_proc_deinit(void); Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c 2007-12-15 05:19:49.319231581 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c @@ -0,0 +1,788 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + @@ -5391,8 +5391,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzari_comp.c +} Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c 2007-12-15 05:19:49.319231581 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c @@ -0,0 +1,747 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + @@ -6143,8 +6143,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzhd_comp.c +} Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c 2007-12-15 05:19:49.323231810 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c @@ -0,0 +1,2435 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + @@ -8583,8 +8583,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzo_comp.c +} Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c 2007-12-15 05:19:49.323231810 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c @@ -0,0 +1,385 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ + @@ -8973,8 +8973,8 @@ Index: linux-2.4.35.4/fs/jffs2/jffs2_bbc_lzss_comp.c +} Index: linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch 2007-12-15 05:19:49.323231810 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch @@ -0,0 +1,97 @@ +FMakefile +=BBC insertion @@ -9075,8 +9075,8 @@ Index: linux-2.4.35.4/fs/jffs2/linux-2.4.25.hpatch ++ Index: linux-2.4.35.4/fs/jffs2/read.c =================================================================== ---- linux-2.4.35.4.orig/fs/jffs2/read.c 2007-12-15 05:19:42.666852484 +0100 -+++ linux-2.4.35.4/fs/jffs2/read.c 2007-12-15 05:19:49.323231810 +0100 +--- linux-2.4.35.4.orig/fs/jffs2/read.c ++++ linux-2.4.35.4/fs/jffs2/read.c @@ -35,6 +35,7 @@ * */ @@ -9085,7 +9085,7 @@ Index: linux-2.4.35.4/fs/jffs2/read.c #include <linux/kernel.h> #include <linux/slab.h> #include <linux/jffs2.h> -@@ -140,6 +141,7 @@ +@@ -140,6 +141,7 @@ int jffs2_read_dnode(struct jffs2_sb_inf D2(printk(KERN_DEBUG "Data CRC matches calculated CRC %08x\n", crc)); if (ri->compr != JFFS2_COMPR_NONE) { D2(printk(KERN_DEBUG "Decompress %d bytes from %p to %d bytes at %p\n", ri->csize, readbuf, ri->dsize, decomprbuf)); @@ -9095,8 +9095,8 @@ Index: linux-2.4.35.4/fs/jffs2/read.c 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 2007-12-15 05:19:42.678853169 +0100 -+++ linux-2.4.35.4/fs/jffs2/super.c 2007-12-15 05:19:49.323231810 +0100 +--- linux-2.4.35.4.orig/fs/jffs2/super.c ++++ linux-2.4.35.4/fs/jffs2/super.c @@ -35,6 +35,7 @@ * */ @@ -9105,7 +9105,7 @@ Index: linux-2.4.35.4/fs/jffs2/super.c #include <linux/config.h> #include <linux/kernel.h> #include <linux/module.h> -@@ -272,6 +273,7 @@ +@@ -272,6 +273,7 @@ static struct super_block *jffs2_read_su sb->s_magic = JFFS2_SUPER_MAGIC; if (!(sb->s_flags & MS_RDONLY)) jffs2_start_garbage_collect_thread(c); @@ -9113,7 +9113,7 @@ Index: linux-2.4.35.4/fs/jffs2/super.c return sb; out_root_i: -@@ -288,6 +290,7 @@ +@@ -288,6 +290,7 @@ static struct super_block *jffs2_read_su void jffs2_put_super (struct super_block *sb) { struct jffs2_sb_info *c = JFFS2_SB_INFO(sb); @@ -9121,7 +9121,7 @@ Index: linux-2.4.35.4/fs/jffs2/super.c D2(printk(KERN_DEBUG "jffs2: jffs2_put_super()\n")); -@@ -344,6 +347,9 @@ +@@ -344,6 +347,9 @@ static int __init init_jffs2_fs(void) { int ret; @@ -9131,7 +9131,7 @@ Index: linux-2.4.35.4/fs/jffs2/super.c printk(KERN_NOTICE "JFFS2 version 2.1. (C) 2001 Red Hat, Inc., designed by Axis Communications AB.\n"); #ifdef JFFS2_OUT_OF_KERNEL -@@ -388,6 +394,8 @@ +@@ -388,6 +394,8 @@ static int __init init_jffs2_fs(void) static void __exit exit_jffs2_fs(void) { diff --git a/target/linux/generic-2.4/patches/004-exec_pagesize.patch b/target/linux/generic-2.4/patches/004-exec_pagesize.patch index c48906dafd..5711cc2861 100644 --- a/target/linux/generic-2.4/patches/004-exec_pagesize.patch +++ b/target/linux/generic-2.4/patches/004-exec_pagesize.patch @@ -1,7 +1,7 @@ Index: linux-2.4.35.4/include/asm-mips/param.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-mips/param.h 2007-12-15 05:19:42.518844050 +0100 -+++ linux-2.4.35.4/include/asm-mips/param.h 2007-12-15 05:19:49.823260305 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/param.h ++++ linux-2.4.35.4/include/asm-mips/param.h @@ -55,7 +55,7 @@ #endif /* defined(__KERNEL__) */ #endif /* defined(HZ) */ diff --git a/target/linux/generic-2.4/patches/005-mtd_flashtypes.patch b/target/linux/generic-2.4/patches/005-mtd_flashtypes.patch index 6e4b5c820f..66a92e8b6b 100644 --- a/target/linux/generic-2.4/patches/005-mtd_flashtypes.patch +++ b/target/linux/generic-2.4/patches/005-mtd_flashtypes.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/drivers/mtd/chips/Config.in =================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/chips/Config.in 2007-12-15 05:19:42.454840402 +0100 -+++ linux-2.4.35.4/drivers/mtd/chips/Config.in 2007-12-15 05:19:50.035272385 +0100 -@@ -45,6 +45,7 @@ +--- linux-2.4.35.4.orig/drivers/mtd/chips/Config.in ++++ linux-2.4.35.4/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 ST (Advanced Architecture) flash chips' CONFIG_MTD_CFI_STAA $CONFIG_MTD_GEN_PROBE @@ -12,9 +12,9 @@ Index: linux-2.4.35.4/drivers/mtd/chips/Config.in 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 2007-12-15 05:19:42.462840857 +0100 -+++ linux-2.4.35.4/drivers/mtd/chips/Makefile 2007-12-15 05:19:50.039272613 +0100 -@@ -18,6 +18,7 @@ +--- linux-2.4.35.4.orig/drivers/mtd/chips/Makefile ++++ linux-2.4.35.4/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_STAA) += cfi_cmdset_0020.o @@ -24,8 +24,8 @@ Index: linux-2.4.35.4/drivers/mtd/chips/Makefile obj-$(CONFIG_MTD_GEN_PROBE) += gen_probe.o Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c 2007-12-15 05:19:50.047273069 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c @@ -0,0 +1,855 @@ +/* + * Common Flash Interface support: @@ -884,9 +884,9 @@ Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0701.c + Index: linux-2.4.35.4/drivers/mtd/chips/cfi_probe.c =================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/chips/cfi_probe.c 2007-12-15 05:19:42.474841541 +0100 -+++ linux-2.4.35.4/drivers/mtd/chips/cfi_probe.c 2007-12-15 05:19:50.051273298 +0100 -@@ -67,8 +67,15 @@ +--- linux-2.4.35.4.orig/drivers/mtd/chips/cfi_probe.c ++++ linux-2.4.35.4/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); @@ -906,9 +906,9 @@ Index: linux-2.4.35.4/drivers/mtd/chips/cfi_probe.c /* 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 2007-12-15 05:19:42.482841997 +0100 -+++ linux-2.4.35.4/drivers/mtd/chips/gen_probe.c 2007-12-15 05:19:50.055273524 +0100 -@@ -328,13 +328,18 @@ +--- linux-2.4.35.4.orig/drivers/mtd/chips/gen_probe.c ++++ linux-2.4.35.4/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 #ifdef CONFIG_MTD_CFI_AMDSTD diff --git a/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch b/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch index 6663202a1f..40f4504773 100644 --- a/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch +++ b/target/linux/generic-2.4/patches/008-intel_flashchip_fix.patch @@ -1,7 +1,7 @@ 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 2007-12-15 05:19:42.414838122 +0100 -+++ linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c 2007-12-15 05:19:50.315288342 +0100 +--- 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 @@ -28,10 +28,18 @@ #include <linux/slab.h> #include <linux/delay.h> @@ -21,7 +21,7 @@ Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c // debugging, turns off buffer write mode #define FORCE_WORD_WRITE static int cfi_intelext_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); -@@ -45,6 +53,7 @@ +@@ -45,6 +53,7 @@ static int cfi_intelext_lock(struct mtd_ static int cfi_intelext_unlock(struct mtd_info *mtd, loff_t ofs, size_t len); static int cfi_intelext_suspend (struct mtd_info *); static void cfi_intelext_resume (struct mtd_info *); @@ -29,7 +29,7 @@ Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c static void cfi_intelext_destroy(struct mtd_info *); -@@ -288,6 +297,9 @@ +@@ -288,6 +297,9 @@ static struct mtd_info *cfi_intelext_set map->fldrv = &cfi_intelext_chipdrv; MOD_INC_USE_COUNT; mtd->name = map->name; @@ -39,7 +39,7 @@ Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c return mtd; setup_err: -@@ -1961,10 +1973,40 @@ +@@ -1961,10 +1973,40 @@ static void cfi_intelext_resume(struct m } } @@ -82,8 +82,8 @@ Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c kfree(cfi); Index: linux-2.4.35.4/include/linux/mtd/mtd.h =================================================================== ---- linux-2.4.35.4.orig/include/linux/mtd/mtd.h 2007-12-15 05:19:42.422838578 +0100 -+++ linux-2.4.35.4/include/linux/mtd/mtd.h 2007-12-15 05:19:50.315288342 +0100 +--- linux-2.4.35.4.orig/include/linux/mtd/mtd.h ++++ linux-2.4.35.4/include/linux/mtd/mtd.h @@ -10,6 +10,7 @@ #include <linux/version.h> #include <linux/types.h> @@ -92,7 +92,7 @@ Index: linux-2.4.35.4/include/linux/mtd/mtd.h #include <linux/module.h> #include <linux/uio.h> -@@ -217,6 +218,8 @@ +@@ -217,6 +218,8 @@ struct mtd_info { int (*suspend) (struct mtd_info *mtd); void (*resume) (struct mtd_info *mtd); diff --git a/target/linux/generic-2.4/patches/009-mtd_uaccess.patch b/target/linux/generic-2.4/patches/009-mtd_uaccess.patch index 0d02d8557c..fd0a9a47ea 100644 --- a/target/linux/generic-2.4/patches/009-mtd_uaccess.patch +++ b/target/linux/generic-2.4/patches/009-mtd_uaccess.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/drivers/mtd/mtdchar.c =================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/mtdchar.c 2007-12-15 05:19:42.370835614 +0100 -+++ linux-2.4.35.4/drivers/mtd/mtdchar.c 2007-12-15 05:19:50.539301109 +0100 -@@ -558,13 +558,13 @@ +--- linux-2.4.35.4.orig/drivers/mtd/mtdchar.c ++++ linux-2.4.35.4/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, DEVFS_FL_DEFAULT, MTD_CHAR_MAJOR, mtd->index*2, @@ -20,9 +20,9 @@ Index: linux-2.4.35.4/drivers/mtd/mtdchar.c Index: linux-2.4.35.4/drivers/mtd/mtdblock.c =================================================================== ---- linux-2.4.35.4.orig/drivers/mtd/mtdblock.c 2007-12-15 05:19:42.378836072 +0100 -+++ linux-2.4.35.4/drivers/mtd/mtdblock.c 2007-12-15 05:19:50.539301109 +0100 -@@ -601,7 +601,7 @@ +--- linux-2.4.35.4.orig/drivers/mtd/mtdblock.c ++++ linux-2.4.35.4/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, DEVFS_FL_DEFAULT, MTD_BLOCK_MAJOR, mtd->index, diff --git a/target/linux/generic-2.4/patches/010-disable_old_squashfs_compatibility.patch b/target/linux/generic-2.4/patches/010-disable_old_squashfs_compatibility.patch index 5998e89a55..312b1f6754 100644 --- a/target/linux/generic-2.4/patches/010-disable_old_squashfs_compatibility.patch +++ b/target/linux/generic-2.4/patches/010-disable_old_squashfs_compatibility.patch @@ -1,7 +1,7 @@ Index: linux-2.4.35.4/fs/squashfs/Makefile =================================================================== ---- linux-2.4.35.4.orig/fs/squashfs/Makefile 2007-12-15 05:19:49.031215169 +0100 -+++ linux-2.4.35.4/fs/squashfs/Makefile 2007-12-15 05:19:50.759313646 +0100 +--- linux-2.4.35.4.orig/fs/squashfs/Makefile ++++ linux-2.4.35.4/fs/squashfs/Makefile @@ -4,7 +4,7 @@ O_TARGET := squashfs.o @@ -13,8 +13,8 @@ Index: linux-2.4.35.4/fs/squashfs/Makefile Index: linux-2.4.35.4/fs/squashfs/squashfs.h =================================================================== ---- linux-2.4.35.4.orig/fs/squashfs/squashfs.h 2007-12-15 05:19:48.659193968 +0100 -+++ linux-2.4.35.4/fs/squashfs/squashfs.h 2007-12-15 05:19:50.767314102 +0100 +--- linux-2.4.35.4.orig/fs/squashfs/squashfs.h ++++ linux-2.4.35.4/fs/squashfs/squashfs.h @@ -24,6 +24,9 @@ #ifdef CONFIG_SQUASHFS_1_0_COMPATIBILITY #undef CONFIG_SQUASHFS_1_0_COMPATIBILITY diff --git a/target/linux/generic-2.4/patches/050-build_flags.patch b/target/linux/generic-2.4/patches/050-build_flags.patch index 5eab6334e0..7c32c68814 100644 --- a/target/linux/generic-2.4/patches/050-build_flags.patch +++ b/target/linux/generic-2.4/patches/050-build_flags.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/arch/mips/Makefile =================================================================== ---- linux-2.4.35.4.orig/arch/mips/Makefile 2007-12-15 05:19:44.870978088 +0100 -+++ linux-2.4.35.4/arch/mips/Makefile 2007-12-15 05:19:50.987326639 +0100 -@@ -44,10 +44,10 @@ +--- linux-2.4.35.4.orig/arch/mips/Makefile ++++ linux-2.4.35.4/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 GCCFLAGS += $(call check_gcc, -finline-limit=100000,) @@ -16,7 +16,7 @@ Index: linux-2.4.35.4/arch/mips/Makefile GCCFLAGS += -g ifdef CONFIG_SB1XXX_CORELIS GCCFLAGS += -mno-sched-prolog -fno-omit-frame-pointer -@@ -69,13 +69,13 @@ +@@ -69,13 +69,13 @@ endif set_gccflags = $(shell \ while :; do \ cpu=$(1); isa=-$(2); \ @@ -32,7 +32,7 @@ Index: linux-2.4.35.4/arch/mips/Makefile $(CC) $$gcc_opt$$cpu $$isa -S -o /dev/null \ -xc /dev/null > /dev/null 2>&1 && \ break 2; \ -@@ -90,7 +90,7 @@ +@@ -90,7 +90,7 @@ else \ fi; \ gas_abi=-Wa,-32; gas_cpu=$$cpu; gas_isa=-Wa,$$isa; \ while :; do \ @@ -41,7 +41,7 @@ Index: linux-2.4.35.4/arch/mips/Makefile $(CC) $$gas_abi $$gas_opt$$cpu $$gas_isa -Wa,-Z -c \ -o /dev/null -xassembler /dev/null > /dev/null 2>&1 && \ break 2; \ -@@ -172,6 +172,7 @@ +@@ -172,6 +172,7 @@ endif endif AFLAGS += $(GCCFLAGS) @@ -51,9 +51,9 @@ Index: linux-2.4.35.4/arch/mips/Makefile LD += -m $(ld-emul) Index: linux-2.4.35.4/Makefile =================================================================== ---- linux-2.4.35.4.orig/Makefile 2007-12-15 05:19:45.074989715 +0100 -+++ linux-2.4.35.4/Makefile 2007-12-15 05:19:50.995327098 +0100 -@@ -17,7 +17,7 @@ +--- linux-2.4.35.4.orig/Makefile ++++ linux-2.4.35.4/Makefile +@@ -17,7 +17,7 @@ HPATH = $(TOPDIR)/include FINDHPATH = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu HOSTCC = gcc @@ -62,7 +62,7 @@ Index: linux-2.4.35.4/Makefile CROSS_COMPILE = -@@ -88,10 +88,9 @@ +@@ -88,10 +88,9 @@ export MODLIB # # standard CFLAGS # @@ -74,7 +74,7 @@ Index: linux-2.4.35.4/Makefile -fno-strict-aliasing -fno-common CFLAGS += -fno-builtin-strpbrk -fno-builtin-sprintf ifndef CONFIG_FRAME_POINTER -@@ -105,6 +104,8 @@ +@@ -105,6 +104,8 @@ if_gcc4 = $(shell if echo __GNUC__ | $(C # disable pointer signedness warnings in gcc 4.0 CFLAGS += $(call check_gcc,-Wno-pointer-sign,) diff --git a/target/linux/generic-2.4/patches/051-parallel_build.patch b/target/linux/generic-2.4/patches/051-parallel_build.patch index ff9d88bcf5..63bc745fb7 100644 --- a/target/linux/generic-2.4/patches/051-parallel_build.patch +++ b/target/linux/generic-2.4/patches/051-parallel_build.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/arch/mips/Makefile =================================================================== ---- linux-2.4.35.4.orig/arch/mips/Makefile 2007-12-15 05:19:50.987326639 +0100 -+++ linux-2.4.35.4/arch/mips/Makefile 2007-12-15 05:19:51.215339635 +0100 -@@ -739,6 +739,7 @@ +--- linux-2.4.35.4.orig/arch/mips/Makefile ++++ linux-2.4.35.4/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 SUBDIRS := $(addprefix arch/mips/, tools) $(SUBDIRS) $(addprefix arch/mips/, kernel mm lib) @@ -10,7 +10,7 @@ Index: linux-2.4.35.4/arch/mips/Makefile CORE_FILES := arch/mips/kernel/kernel.o arch/mips/mm/mm.o $(CORE_FILES) LIBS := arch/mips/lib/lib.a $(LIBS) -@@ -785,7 +786,7 @@ +@@ -785,7 +786,7 @@ archmrproper: $(MAKE) -C arch/$(ARCH)/tools mrproper archdep: diff --git a/target/linux/generic-2.4/patches/051-remove_pcmcia_modinst_compat.patch b/target/linux/generic-2.4/patches/051-remove_pcmcia_modinst_compat.patch index 5e1b6b7eff..ad724ecfb5 100644 --- a/target/linux/generic-2.4/patches/051-remove_pcmcia_modinst_compat.patch +++ b/target/linux/generic-2.4/patches/051-remove_pcmcia_modinst_compat.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/Makefile =================================================================== ---- linux-2.4.35.4.orig/Makefile 2007-12-15 05:19:50.995327098 +0100 -+++ linux-2.4.35.4/Makefile 2007-12-15 05:19:51.427351715 +0100 -@@ -428,18 +428,9 @@ +--- linux-2.4.35.4.orig/Makefile ++++ linux-2.4.35.4/Makefile +@@ -428,18 +428,9 @@ else depmod_opts := -b $(INSTALL_MOD_PATH) -r endif .PHONY: _modinst_post diff --git a/target/linux/generic-2.4/patches/100-wireless-extension.patch b/target/linux/generic-2.4/patches/100-wireless-extension.patch index fe10d501f5..da65961b1f 100644 --- a/target/linux/generic-2.4/patches/100-wireless-extension.patch +++ b/target/linux/generic-2.4/patches/100-wireless-extension.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/include/linux/netdevice.h =================================================================== ---- linux-2.4.35.4.orig/include/linux/netdevice.h 2007-12-15 05:19:42.162823760 +0100 -+++ linux-2.4.35.4/include/linux/netdevice.h 2007-12-15 05:19:51.635363571 +0100 -@@ -295,7 +295,9 @@ +--- linux-2.4.35.4.orig/include/linux/netdevice.h ++++ linux-2.4.35.4/include/linux/netdevice.h +@@ -295,7 +295,9 @@ struct net_device /* List of functions to handle Wireless Extensions (instead of ioctl). * See <net/iw_handler.h> for details. Jean II */ @@ -15,8 +15,8 @@ Index: linux-2.4.35.4/include/linux/netdevice.h Index: linux-2.4.35.4/include/linux/wireless.h =================================================================== ---- linux-2.4.35.4.orig/include/linux/wireless.h 2007-12-15 05:19:42.170824216 +0100 -+++ linux-2.4.35.4/include/linux/wireless.h 2007-12-15 05:19:51.643364027 +0100 +--- linux-2.4.35.4.orig/include/linux/wireless.h ++++ linux-2.4.35.4/include/linux/wireless.h @@ -1,10 +1,10 @@ /* * This file define a set of standard wireless extensions @@ -305,7 +305,7 @@ Index: linux-2.4.35.4/include/linux/wireless.h /****************************** TYPES ******************************/ /* --------------------------- SUBTYPES --------------------------- */ -@@ -456,7 +644,7 @@ +@@ -456,7 +644,7 @@ struct iw_freq __s32 m; /* Mantissa */ __s16 e; /* Exponent */ __u8 i; /* List index (when in range struct) */ @@ -314,7 +314,7 @@ Index: linux-2.4.35.4/include/linux/wireless.h }; /* -@@ -507,6 +695,132 @@ +@@ -507,6 +695,132 @@ struct iw_thrspy struct iw_quality high; /* High threshold */ }; @@ -447,7 +447,7 @@ Index: linux-2.4.35.4/include/linux/wireless.h /* ------------------------ WIRELESS STATS ------------------------ */ /* * Wireless statistics (used for /proc/net/wireless) -@@ -610,11 +924,12 @@ +@@ -610,11 +924,12 @@ struct iw_range /* Old Frequency (backward compat - moved lower ) */ __u16 old_num_channels; __u8 old_num_frequency; @@ -463,7 +463,7 @@ Index: linux-2.4.35.4/include/linux/wireless.h /* Quality of link & SNR stuff */ /* Quality range (link, level, noise) -@@ -685,6 +1000,8 @@ +@@ -685,6 +1000,8 @@ struct iw_range struct iw_freq freq[IW_MAX_FREQUENCIES]; /* list */ /* Note : this frequency list doesn't need to fit channel numbers, * because each entry contain its channel index */ @@ -474,8 +474,8 @@ Index: linux-2.4.35.4/include/linux/wireless.h /* Index: linux-2.4.35.4/include/net/iw_handler.h =================================================================== ---- linux-2.4.35.4.orig/include/net/iw_handler.h 2007-12-15 05:19:42.178824671 +0100 -+++ linux-2.4.35.4/include/net/iw_handler.h 2007-12-15 05:19:51.647364253 +0100 +--- linux-2.4.35.4.orig/include/net/iw_handler.h ++++ linux-2.4.35.4/include/net/iw_handler.h @@ -1,10 +1,10 @@ /* * This file define the new driver API for Wireless Extensions @@ -526,7 +526,7 @@ Index: linux-2.4.35.4/include/net/iw_handler.h /* Driver level flags */ #define IW_DESCR_FLAG_WAIT 0x0100 /* Wait for driver event */ -@@ -311,23 +319,25 @@ +@@ -311,23 +319,25 @@ struct iw_handler_def /* Array of handlers for standard ioctls * We will call dev->wireless_handlers->standard[ioctl - SIOCSIWNAME] */ @@ -559,7 +559,7 @@ Index: linux-2.4.35.4/include/net/iw_handler.h }; /* ---------------------- IOCTL DESCRIPTION ---------------------- */ -@@ -374,18 +384,29 @@ +@@ -374,18 +384,29 @@ struct iw_ioctl_description */ struct iw_spy_data { @@ -595,9 +595,9 @@ Index: linux-2.4.35.4/include/net/iw_handler.h /**************************** PROTOTYPES ****************************/ Index: linux-2.4.35.4/net/core/dev.c =================================================================== ---- linux-2.4.35.4.orig/net/core/dev.c 2007-12-15 05:19:42.186825129 +0100 -+++ linux-2.4.35.4/net/core/dev.c 2007-12-15 05:19:51.651364482 +0100 -@@ -2426,7 +2426,7 @@ +--- linux-2.4.35.4.orig/net/core/dev.c ++++ linux-2.4.35.4/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); rtnl_unlock(); @@ -608,8 +608,8 @@ Index: linux-2.4.35.4/net/core/dev.c return ret; Index: linux-2.4.35.4/net/core/wireless.c =================================================================== ---- linux-2.4.35.4.orig/net/core/wireless.c 2007-12-15 05:19:42.194825585 +0100 -+++ linux-2.4.35.4/net/core/wireless.c 2007-12-15 05:19:51.655364711 +0100 +--- linux-2.4.35.4.orig/net/core/wireless.c ++++ linux-2.4.35.4/net/core/wireless.c @@ -2,7 +2,7 @@ * This file implement the Wireless Extensions APIs. * @@ -649,7 +649,7 @@ Index: linux-2.4.35.4/net/core/wireless.c #undef WE_IOCTL_DEBUG /* Debug IOCTL API */ #undef WE_EVENT_DEBUG /* Debug Event dispatcher */ #undef WE_SPY_DEBUG /* Debug enhanced spy support */ -@@ -131,14 +137,14 @@ +@@ -131,14 +137,14 @@ static const struct iw_ioctl_description { IW_HEADER_TYPE_ADDR, 0, 0, 0, 0, 0}, /* SIOCGIWAP */ { IW_HEADER_TYPE_ADDR, 0, 0, 0, 0, IW_DESCR_FLAG_DUMP}, @@ -669,7 +669,7 @@ Index: linux-2.4.35.4/net/core/wireless.c /* SIOCSIWESSID */ { IW_HEADER_TYPE_POINT, 0, 1, 0, IW_ESSID_MAX_SIZE + 1, IW_DESCR_FLAG_EVENT}, /* SIOCGIWESSID */ -@@ -179,6 +185,25 @@ +@@ -179,6 +185,25 @@ static const struct iw_ioctl_description { IW_HEADER_TYPE_PARAM, 0, 0, 0, 0, 0}, /* SIOCGIWPOWER */ { IW_HEADER_TYPE_PARAM, 0, 0, 0, 0, 0}, @@ -695,7 +695,7 @@ Index: linux-2.4.35.4/net/core/wireless.c }; static const int standard_ioctl_num = (sizeof(standard_ioctl) / sizeof(struct iw_ioctl_description)); -@@ -198,12 +223,22 @@ +@@ -198,12 +223,22 @@ static const struct iw_ioctl_description { IW_HEADER_TYPE_ADDR, 0, 0, 0, 0, 0}, /* IWEVEXPIRED */ { IW_HEADER_TYPE_ADDR, 0, 0, 0, 0, 0}, @@ -719,7 +719,7 @@ Index: linux-2.4.35.4/net/core/wireless.c 0, /* IW_PRIV_TYPE_NONE */ 1, /* IW_PRIV_TYPE_BYTE */ 1, /* IW_PRIV_TYPE_CHAR */ -@@ -270,12 +305,15 @@ +@@ -270,12 +305,15 @@ static inline iw_handler get_handler(str */ static inline struct iw_statistics *get_wireless_stats(struct net_device *dev) { @@ -738,7 +738,7 @@ Index: linux-2.4.35.4/net/core/wireless.c } /* ---------------------------------------------------------------- */ -@@ -310,14 +348,32 @@ +@@ -310,14 +348,32 @@ static inline int call_commit_handler(st /* ---------------------------------------------------------------- */ /* @@ -773,7 +773,7 @@ Index: linux-2.4.35.4/net/core/wireless.c } -@@ -350,11 +406,14 @@ +@@ -350,11 +406,14 @@ static inline int sprintf_wireless_stats dev->name, stats->status, stats->qual.qual, @@ -791,7 +791,7 @@ Index: linux-2.4.35.4/net/core/wireless.c stats->discard.nwid, stats->discard.code, stats->discard.fragment, -@@ -470,13 +529,15 @@ +@@ -470,13 +529,15 @@ static inline int ioctl_export_private(s /* Check NULL pointer */ if(iwr->u.data.pointer == NULL) return -EFAULT; @@ -810,7 +810,7 @@ Index: linux-2.4.35.4/net/core/wireless.c /* Set the number of available ioctls. */ iwr->u.data.length = dev->wireless_handlers->num_private_args; -@@ -505,7 +566,6 @@ +@@ -505,7 +566,6 @@ static inline int ioctl_standard_call(st const struct iw_ioctl_description * descr; struct iw_request_info info; int ret = -EINVAL; @@ -818,7 +818,7 @@ Index: linux-2.4.35.4/net/core/wireless.c /* Get the description of the IOCTL */ if((cmd - SIOCIWFIRST) >= standard_ioctl_num) -@@ -536,8 +596,14 @@ +@@ -536,8 +596,14 @@ static inline int ioctl_standard_call(st #endif /* WE_SET_EVENT */ } else { char * extra; @@ -833,7 +833,7 @@ Index: linux-2.4.35.4/net/core/wireless.c /* Check what user space is giving us */ if(IW_IS_SET(cmd)) { /* Check NULL pointer */ -@@ -554,18 +620,33 @@ +@@ -554,18 +620,33 @@ static inline int ioctl_standard_call(st if(iwr->u.data.pointer == NULL) return -EFAULT; /* Save user space buffer size for checking */ @@ -873,7 +873,7 @@ Index: linux-2.4.35.4/net/core/wireless.c if (extra == NULL) { return -ENOMEM; } -@@ -591,14 +672,11 @@ +@@ -591,14 +672,11 @@ static inline int ioctl_standard_call(st /* If we have something to return to the user */ if (!ret && IW_IS_GET(cmd)) { @@ -889,7 +889,7 @@ Index: linux-2.4.35.4/net/core/wireless.c err = copy_to_user(iwr->u.data.pointer, extra, iwr->u.data.length * -@@ -661,7 +739,7 @@ +@@ -661,7 +739,7 @@ static inline int ioctl_private_call(str iw_handler handler) { struct iwreq * iwr = (struct iwreq *) ifr; @@ -898,7 +898,7 @@ Index: linux-2.4.35.4/net/core/wireless.c struct iw_request_info info; int extra_size = 0; int i; -@@ -701,7 +779,7 @@ +@@ -701,7 +779,7 @@ static inline int ioctl_private_call(str ((extra_size + offset) <= IFNAMSIZ)) extra_size = 0; } else { @@ -907,7 +907,7 @@ Index: linux-2.4.35.4/net/core/wireless.c extra_size = get_priv_size(descr->get_args); /* Does it fits in iwr ? */ -@@ -771,6 +849,14 @@ +@@ -771,6 +849,14 @@ static inline int ioctl_private_call(str /* If we have something to return to the user */ if (!ret && IW_IS_GET(cmd)) { @@ -922,7 +922,7 @@ Index: linux-2.4.35.4/net/core/wireless.c err = copy_to_user(iwr->u.data.pointer, extra, extra_size); if (err) -@@ -1042,9 +1128,25 @@ +@@ -1042,9 +1128,25 @@ void wireless_send_event(struct net_devi * One of the main advantage of centralising spy support here is that * it becomes much easier to improve and extend it without having to touch * the drivers. One example is the addition of the Spy-Threshold events. @@ -949,7 +949,7 @@ Index: linux-2.4.35.4/net/core/wireless.c /*------------------------------------------------------------------*/ /* * Standard Wireless Handler : set Spy List -@@ -1054,16 +1156,26 @@ +@@ -1054,16 +1156,26 @@ int iw_handler_set_spy(struct net_device union iwreq_data * wrqu, char * extra) { @@ -981,7 +981,7 @@ Index: linux-2.4.35.4/net/core/wireless.c /* Are there are addresses to copy? */ if(wrqu->data.length > 0) { int i; -@@ -1089,13 +1201,14 @@ +@@ -1089,13 +1201,14 @@ int iw_handler_set_spy(struct net_device spydata->spy_address[i][5]); #endif /* WE_SPY_DEBUG */ } @@ -999,7 +999,7 @@ Index: linux-2.4.35.4/net/core/wireless.c } /*------------------------------------------------------------------*/ -@@ -1107,12 +1220,14 @@ +@@ -1107,12 +1220,14 @@ int iw_handler_get_spy(struct net_device union iwreq_data * wrqu, char * extra) { @@ -1017,7 +1017,7 @@ Index: linux-2.4.35.4/net/core/wireless.c wrqu->data.length = spydata->spy_number; /* Copy addresses. */ -@@ -1129,9 +1244,6 @@ +@@ -1129,9 +1244,6 @@ int iw_handler_get_spy(struct net_device for(i = 0; i < spydata->spy_number; i++) spydata->spy_stat[i].updated = 0; return 0; @@ -1027,7 +1027,7 @@ Index: linux-2.4.35.4/net/core/wireless.c } /*------------------------------------------------------------------*/ -@@ -1143,11 +1255,13 @@ +@@ -1143,11 +1255,13 @@ int iw_handler_set_thrspy(struct net_dev union iwreq_data * wrqu, char * extra) { @@ -1044,7 +1044,7 @@ Index: linux-2.4.35.4/net/core/wireless.c /* Just do it */ memcpy(&(spydata->spy_thr_low), &(threshold->low), 2 * sizeof(struct iw_quality)); -@@ -1160,9 +1274,6 @@ +@@ -1160,9 +1274,6 @@ int iw_handler_set_thrspy(struct net_dev #endif /* WE_SPY_DEBUG */ return 0; @@ -1054,7 +1054,7 @@ Index: linux-2.4.35.4/net/core/wireless.c } /*------------------------------------------------------------------*/ -@@ -1174,22 +1285,20 @@ +@@ -1174,22 +1285,20 @@ int iw_handler_get_thrspy(struct net_dev union iwreq_data * wrqu, char * extra) { @@ -1082,7 +1082,7 @@ Index: linux-2.4.35.4/net/core/wireless.c /*------------------------------------------------------------------*/ /* * Prepare and send a Spy Threshold event -@@ -1227,7 +1336,6 @@ +@@ -1227,7 +1336,6 @@ static void iw_send_thrspy_event(struct /* Send event to user space */ wireless_send_event(dev, SIOCGIWTHRSPY, &wrqu, (char *) &threshold); } @@ -1090,7 +1090,7 @@ Index: linux-2.4.35.4/net/core/wireless.c /* ---------------------------------------------------------------- */ /* -@@ -1240,12 +1348,14 @@ +@@ -1240,12 +1348,14 @@ void wireless_spy_update(struct net_devi unsigned char * address, struct iw_quality * wstats) { @@ -1108,7 +1108,7 @@ Index: linux-2.4.35.4/net/core/wireless.c #ifdef WE_SPY_DEBUG printk(KERN_DEBUG "wireless_spy_update() : offset %ld, spydata %p, address %02X:%02X:%02X:%02X:%02X:%02X\n", dev->wireless_handlers->spy_offset, spydata, address[0], address[1], address[2], address[3], address[4], address[5]); #endif /* WE_SPY_DEBUG */ -@@ -1257,7 +1367,7 @@ +@@ -1257,7 +1367,7 @@ void wireless_spy_update(struct net_devi sizeof(struct iw_quality)); match = i; } @@ -1117,7 +1117,7 @@ Index: linux-2.4.35.4/net/core/wireless.c /* Generate an event if we cross the spy threshold. * To avoid event storms, we have a simple hysteresis : we generate * event only when we go under the low threshold or above the -@@ -1277,6 +1387,4 @@ +@@ -1277,6 +1387,4 @@ void wireless_spy_update(struct net_devi } } } diff --git a/target/linux/generic-2.4/patches/106-mppe_mppc.patch b/target/linux/generic-2.4/patches/106-mppe_mppc.patch index 7cc5dc9867..db29f56922 100644 --- a/target/linux/generic-2.4/patches/106-mppe_mppc.patch +++ b/target/linux/generic-2.4/patches/106-mppe_mppc.patch @@ -6,9 +6,9 @@ Microsoft Point-to-Point Encryption / Compression support Index: linux-2.4.35.4/Documentation/Configure.help =================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:19:49.287229757 +0100 -+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:19:51.927380210 +0100 -@@ -9974,6 +9974,28 @@ +--- linux-2.4.35.4.orig/Documentation/Configure.help ++++ linux-2.4.35.4/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. @@ -39,9 +39,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help Support for PPP over Ethernet. Index: linux-2.4.35.4/crypto/Config.in =================================================================== ---- linux-2.4.35.4.orig/crypto/Config.in 2007-12-15 05:19:42.094819886 +0100 -+++ linux-2.4.35.4/crypto/Config.in 2007-12-15 05:19:51.927380210 +0100 -@@ -11,7 +11,9 @@ +--- linux-2.4.35.4.orig/crypto/Config.in ++++ linux-2.4.35.4/crypto/Config.in +@@ -11,7 +11,9 @@ if [ "$CONFIG_INET_AH" = "y" -o \ "$CONFIG_INET6_AH" = "y" -o \ "$CONFIG_INET6_AH" = "m" -o \ "$CONFIG_INET6_ESP" = "y" -o \ @@ -52,7 +52,7 @@ Index: linux-2.4.35.4/crypto/Config.in define_bool CONFIG_CRYPTO y else bool 'Cryptographic API' CONFIG_CRYPTO -@@ -51,11 +53,24 @@ +@@ -51,11 +53,24 @@ if [ "$CONFIG_CRYPTO" = "y" ]; then "$CONFIG_INET6_AH" = "y" -o \ "$CONFIG_INET6_AH" = "m" -o \ "$CONFIG_INET6_ESP" = "y" -o \ @@ -81,7 +81,7 @@ Index: linux-2.4.35.4/crypto/Config.in tristate ' SHA256 digest algorithm' CONFIG_CRYPTO_SHA256 tristate ' SHA384 and SHA512 digest algorithms' CONFIG_CRYPTO_SHA512 tristate ' Whirlpool digest algorithms' CONFIG_CRYPTO_WP512 -@@ -76,7 +91,20 @@ +@@ -76,7 +91,20 @@ if [ "$CONFIG_CRYPTO" = "y" ]; then tristate ' TEA and XTEA cipher algorithms' CONFIG_CRYPTO_TEA tristate ' Khazad cipher algorithm' CONFIG_CRYPTO_KHAZAD tristate ' Anubis cipher algorithm' CONFIG_CRYPTO_ANUBIS @@ -104,9 +104,9 @@ Index: linux-2.4.35.4/crypto/Config.in "$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 2007-12-15 05:19:42.102820341 +0100 -+++ linux-2.4.35.4/drivers/net/Config.in 2007-12-15 05:19:51.931380439 +0100 -@@ -336,6 +336,7 @@ +--- linux-2.4.35.4.orig/drivers/net/Config.in ++++ linux-2.4.35.4/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 dep_tristate ' PPP BSD-Compress compression' CONFIG_PPP_BSDCOMP $CONFIG_PPP @@ -116,9 +116,9 @@ Index: linux-2.4.35.4/drivers/net/Config.in fi Index: linux-2.4.35.4/drivers/net/Makefile =================================================================== ---- linux-2.4.35.4.orig/drivers/net/Makefile 2007-12-15 05:19:42.110820796 +0100 -+++ linux-2.4.35.4/drivers/net/Makefile 2007-12-15 05:19:51.931380439 +0100 -@@ -166,6 +166,7 @@ +--- linux-2.4.35.4.orig/drivers/net/Makefile ++++ linux-2.4.35.4/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_PPP_BSDCOMP) += bsd_comp.o @@ -128,8 +128,8 @@ Index: linux-2.4.35.4/drivers/net/Makefile 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 2007-12-15 05:19:42.114821025 +0100 -+++ linux-2.4.35.4/drivers/net/ppp_generic.c 2007-12-15 05:19:51.931380439 +0100 +--- linux-2.4.35.4.orig/drivers/net/ppp_generic.c ++++ linux-2.4.35.4/drivers/net/ppp_generic.c @@ -19,7 +19,7 @@ * PPP driver, written by Michael Callahan and Al Longyear, and * subsequently hacked by Paul Mackerras. @@ -139,7 +139,7 @@ Index: linux-2.4.35.4/drivers/net/ppp_generic.c */ #include <linux/config.h> -@@ -102,6 +102,7 @@ +@@ -102,6 +102,7 @@ struct ppp { spinlock_t rlock; /* lock for receive side 58 */ spinlock_t wlock; /* lock for transmit side 5c */ int mru; /* max receive unit 60 */ @@ -147,7 +147,7 @@ Index: linux-2.4.35.4/drivers/net/ppp_generic.c unsigned int flags; /* control bits 64 */ unsigned int xstate; /* transmit state bits 68 */ unsigned int rstate; /* receive state bits 6c */ -@@ -552,7 +553,9 @@ +@@ -552,7 +553,9 @@ static int ppp_ioctl(struct inode *inode case PPPIOCSMRU: if (get_user(val, (int *) arg)) break; @@ -158,7 +158,7 @@ Index: linux-2.4.35.4/drivers/net/ppp_generic.c err = 0; break; -@@ -1025,14 +1028,37 @@ +@@ -1025,14 +1028,37 @@ ppp_send_frame(struct ppp *ppp, struct s case PPP_CCP: /* peek at outbound CCP frames */ ppp_ccp_peek(ppp, skb, 0); @@ -198,7 +198,7 @@ Index: linux-2.4.35.4/drivers/net/ppp_generic.c if (new_skb == 0) { printk(KERN_ERR "PPP: no memory (comp pkt)\n"); goto drop; -@@ -1050,9 +1076,21 @@ +@@ -1050,9 +1076,21 @@ ppp_send_frame(struct ppp *ppp, struct s skb = new_skb; skb_put(skb, len); skb_pull(skb, 2); /* pull off A/C bytes */ @@ -221,7 +221,7 @@ Index: linux-2.4.35.4/drivers/net/ppp_generic.c } } -@@ -1540,14 +1578,15 @@ +@@ -1540,14 +1578,15 @@ ppp_decompress_frame(struct ppp *ppp, st int len; if (proto == PPP_COMP) { @@ -239,7 +239,7 @@ Index: linux-2.4.35.4/drivers/net/ppp_generic.c if (len < 0) { /* Pass the compressed frame to pppd as an error indication. */ -@@ -1573,7 +1612,14 @@ +@@ -1573,7 +1612,14 @@ ppp_decompress_frame(struct ppp *ppp, st return skb; err: @@ -255,7 +255,7 @@ Index: linux-2.4.35.4/drivers/net/ppp_generic.c ppp_receive_error(ppp); return skb; } -@@ -2253,6 +2299,7 @@ +@@ -2253,6 +2299,7 @@ ppp_create_interface(int unit, int *retp /* Initialize the new ppp unit */ ppp->file.index = unit; ppp->mru = PPP_MRU; @@ -265,8 +265,8 @@ Index: linux-2.4.35.4/drivers/net/ppp_generic.c for (i = 0; i < NUM_NP; ++i) Index: linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c 2007-12-15 05:19:51.935380668 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c @@ -0,0 +1,1312 @@ +/* + * ppp_mppe_mppc.c - MPPC/MPPE "compressor/decompressor" module. @@ -1582,8 +1582,8 @@ Index: linux-2.4.35.4/drivers/net/ppp_mppe_mppc.c +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 2007-12-15 05:19:42.134822165 +0100 -+++ linux-2.4.35.4/include/linux/ppp-comp.h 2007-12-15 05:19:51.935380668 +0100 +--- linux-2.4.35.4.orig/include/linux/ppp-comp.h ++++ linux-2.4.35.4/include/linux/ppp-comp.h @@ -28,7 +28,7 @@ */ @@ -1593,7 +1593,7 @@ Index: linux-2.4.35.4/include/linux/ppp-comp.h * * NOTE TO MAINTAINERS: * If you modify this file at all, please set the above date. -@@ -78,7 +78,7 @@ +@@ -78,7 +78,7 @@ struct compressor { /* Compress a packet */ int (*compress) (void *state, unsigned char *rptr, @@ -1602,7 +1602,7 @@ Index: linux-2.4.35.4/include/linux/ppp-comp.h /* Return compression statistics */ void (*comp_stat) (void *state, struct compstat *stats); -@@ -99,7 +99,7 @@ +@@ -99,7 +99,7 @@ struct compressor { /* Decompress a packet. */ int (*decompress) (void *state, unsigned char *ibuf, int isize, @@ -1611,7 +1611,7 @@ Index: linux-2.4.35.4/include/linux/ppp-comp.h /* Update state for an incompressible packet received */ void (*incomp) (void *state, unsigned char *ibuf, int icnt); -@@ -187,6 +187,42 @@ +@@ -187,6 +187,42 @@ struct compressor { #define DEFLATE_CHK_SEQUENCE 0 /* diff --git a/target/linux/generic-2.4/patches/107-cifs.patch b/target/linux/generic-2.4/patches/107-cifs.patch index 3413e00210..f05ee3c85e 100644 --- a/target/linux/generic-2.4/patches/107-cifs.patch +++ b/target/linux/generic-2.4/patches/107-cifs.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help =================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:19:51.927380210 +0100 -+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:19:52.251398675 +0100 -@@ -17995,6 +17995,34 @@ +--- linux-2.4.35.4.orig/Documentation/Configure.help ++++ linux-2.4.35.4/Documentation/Configure.help +@@ -17995,6 +17995,34 @@ CONFIG_UNIXWARE_DISKLABEL If you don't know what all this is about, say N. @@ -39,9 +39,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help 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 2007-12-15 05:19:41.822804384 +0100 -+++ linux-2.4.35.4/Documentation/filesystems/00-INDEX 2007-12-15 05:19:52.255398905 +0100 -@@ -10,6 +10,8 @@ +--- linux-2.4.35.4.orig/Documentation/filesystems/00-INDEX ++++ linux-2.4.35.4/Documentation/filesystems/00-INDEX +@@ -10,6 +10,8 @@ befs.txt - info for the BeOS file system (BFS) bfs.txt - info for the SCO UnixWare Boot Filesystem (BFS). @@ -52,8 +52,8 @@ Index: linux-2.4.35.4/Documentation/filesystems/00-INDEX cramfs.txt Index: linux-2.4.35.4/Documentation/filesystems/cifs.txt =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/Documentation/filesystems/cifs.txt 2007-12-15 05:19:52.259399131 +0100 +--- /dev/null ++++ linux-2.4.35.4/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 @@ -108,8 +108,8 @@ Index: linux-2.4.35.4/Documentation/filesystems/cifs.txt + http://www.samba.org Index: linux-2.4.35.4/fs/cifs/asn1.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/asn1.c 2007-12-15 05:19:52.263399360 +0100 +--- /dev/null ++++ linux-2.4.35.4/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 @@ -727,8 +727,8 @@ Index: linux-2.4.35.4/fs/cifs/asn1.c +} Index: linux-2.4.35.4/fs/cifs/AUTHORS =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/AUTHORS 2007-12-15 05:19:52.267399586 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/AUTHORS @@ -0,0 +1,37 @@ +Original Author +=============== @@ -769,8 +769,8 @@ Index: linux-2.4.35.4/fs/cifs/AUTHORS +finding multiple bugs during excellent stress test runs. Index: linux-2.4.35.4/fs/cifs/CHANGES =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/CHANGES 2007-12-15 05:19:52.271399815 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/CHANGES @@ -0,0 +1,572 @@ +Version 1.20 +------------ @@ -1346,8 +1346,8 @@ Index: linux-2.4.35.4/fs/cifs/CHANGES + Index: linux-2.4.35.4/fs/cifs/cifs_debug.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/cifs_debug.c 2007-12-15 05:19:52.275400045 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/cifs_debug.c @@ -0,0 +1,797 @@ +/* + * fs/cifs_debug.c @@ -2148,8 +2148,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_debug.c +#endif Index: linux-2.4.35.4/fs/cifs/cifs_debug.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/cifs_debug.h 2007-12-15 05:19:52.279400271 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/cifs_debug.h @@ -0,0 +1,66 @@ +/* + * @@ -2219,8 +2219,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_debug.h +#endif /* _H_CIFS_DEBUG */ Index: linux-2.4.35.4/fs/cifs/cifsencrypt.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/cifsencrypt.c 2007-12-15 05:19:52.279400271 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/cifsencrypt.c @@ -0,0 +1,204 @@ +/* + * fs/cifs/cifsencrypt.c @@ -2428,8 +2428,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsencrypt.c +} Index: linux-2.4.35.4/fs/cifs/cifserr.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/cifserr.c 2007-12-15 05:19:52.279400271 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/cifserr.c @@ -0,0 +1,70 @@ +/* + * fs/cifserr.c @@ -2503,8 +2503,8 @@ Index: linux-2.4.35.4/fs/cifs/cifserr.c +} Index: linux-2.4.35.4/fs/cifs/cifsfs.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/cifsfs.c 2007-12-15 05:19:52.279400271 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/cifsfs.c @@ -0,0 +1,769 @@ +/* + * fs/cifs/cifsfs.c @@ -3277,8 +3277,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsfs.c +module_exit(exit_cifs) Index: linux-2.4.35.4/fs/cifs/cifsfs.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/cifsfs.h 2007-12-15 05:19:52.279400271 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/cifsfs.h @@ -0,0 +1,97 @@ +/* + * fs/cifs/cifsfs.h @@ -3379,8 +3379,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsfs.h +#endif /* _CIFSFS_H */ Index: linux-2.4.35.4/fs/cifs/cifs_fs_sb.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/cifs_fs_sb.h 2007-12-15 05:19:52.283400500 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/cifs_fs_sb.h @@ -0,0 +1,32 @@ +/* + * fs/cifs/cifs_fs_sb.h @@ -3416,8 +3416,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_fs_sb.h +#endif /* _CIFS_FS_SB_H */ Index: linux-2.4.35.4/fs/cifs/cifsglob.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/cifsglob.h 2007-12-15 05:19:52.283400500 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/cifsglob.h @@ -0,0 +1,413 @@ +/* + * fs/cifs/cifsglob.h @@ -3834,8 +3834,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsglob.h + Index: linux-2.4.35.4/fs/cifs/cifspdu.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/cifspdu.h 2007-12-15 05:19:52.283400500 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/cifspdu.h @@ -0,0 +1,1793 @@ +/* + * fs/cifs/cifspdu.h @@ -5632,8 +5632,8 @@ Index: linux-2.4.35.4/fs/cifs/cifspdu.h +#endif /* _CIFSPDU_H */ Index: linux-2.4.35.4/fs/cifs/cifsproto.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/cifsproto.h 2007-12-15 05:19:52.287400726 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/cifsproto.h @@ -0,0 +1,254 @@ +/* + * fs/cifs/cifsproto.h @@ -5891,8 +5891,8 @@ Index: linux-2.4.35.4/fs/cifs/cifsproto.h +#endif /* _CIFSPROTO_H */ Index: linux-2.4.35.4/fs/cifs/cifssmb.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/cifssmb.c 2007-12-15 05:19:52.287400726 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/cifssmb.c @@ -0,0 +1,3016 @@ +/* + * fs/cifs/cifssmb.c @@ -8912,8 +8912,8 @@ Index: linux-2.4.35.4/fs/cifs/cifssmb.c +#endif Index: linux-2.4.35.4/fs/cifs/cifs_unicode.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/cifs_unicode.c 2007-12-15 05:19:52.291400955 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/cifs_unicode.c @@ -0,0 +1,87 @@ +/* + * fs/cifs/cifs_unicode.c @@ -9004,8 +9004,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_unicode.c + Index: linux-2.4.35.4/fs/cifs/cifs_unicode.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/cifs_unicode.h 2007-12-15 05:19:52.291400955 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/cifs_unicode.h @@ -0,0 +1,353 @@ +/* + * cifs_unicode: Unicode kernel case support @@ -9362,8 +9362,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_unicode.h +#endif Index: linux-2.4.35.4/fs/cifs/cifs_uniupr.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/cifs_uniupr.h 2007-12-15 05:19:52.291400955 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/cifs_uniupr.h @@ -0,0 +1,253 @@ +/* + * Copyright (c) International Business Machines Corp., 2000,2002 @@ -9620,8 +9620,8 @@ Index: linux-2.4.35.4/fs/cifs/cifs_uniupr.h +#endif Index: linux-2.4.35.4/fs/cifs/connect.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/connect.c 2007-12-15 05:19:52.295401184 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/connect.c @@ -0,0 +1,2924 @@ +/* + * fs/cifs/connect.c @@ -12549,8 +12549,8 @@ Index: linux-2.4.35.4/fs/cifs/connect.c + Index: linux-2.4.35.4/fs/cifs/dir.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/dir.c 2007-12-15 05:19:52.295401184 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/dir.c @@ -0,0 +1,425 @@ +/* + * fs/cifs/dir.c @@ -12979,8 +12979,8 @@ Index: linux-2.4.35.4/fs/cifs/dir.c +}; Index: linux-2.4.35.4/fs/cifs/file.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/file.c 2007-12-15 05:19:52.299401411 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/file.c @@ -0,0 +1,2185 @@ +/* + * fs/cifs/file.c @@ -15169,8 +15169,8 @@ Index: linux-2.4.35.4/fs/cifs/file.c +}; Index: linux-2.4.35.4/fs/cifs/inode.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/inode.c 2007-12-15 05:19:52.299401411 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/inode.c @@ -0,0 +1,1079 @@ +/* + * fs/cifs/inode.c @@ -16253,8 +16253,8 @@ Index: linux-2.4.35.4/fs/cifs/inode.c +} Index: linux-2.4.35.4/fs/cifs/link.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/link.c 2007-12-15 05:19:52.299401411 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/link.c @@ -0,0 +1,328 @@ +/* + * fs/cifs/link.c @@ -16586,8 +16586,8 @@ Index: linux-2.4.35.4/fs/cifs/link.c +} Index: linux-2.4.35.4/fs/cifs/Makefile =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/Makefile 2007-12-15 05:19:52.303401640 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/Makefile @@ -0,0 +1,10 @@ +# +# Makefile for Linux CIFS VFS client @@ -16601,8 +16601,8 @@ Index: linux-2.4.35.4/fs/cifs/Makefile +include $(TOPDIR)/Rules.make Index: linux-2.4.35.4/fs/cifs/md4.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/md4.c 2007-12-15 05:19:52.303401640 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/md4.c @@ -0,0 +1,203 @@ +/* + Unix SMB/Netbios implementation. @@ -16809,8 +16809,8 @@ Index: linux-2.4.35.4/fs/cifs/md4.c +} Index: linux-2.4.35.4/fs/cifs/md5.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/md5.c 2007-12-15 05:19:52.303401640 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/md5.c @@ -0,0 +1,363 @@ +/* + * This code implements the MD5 message-digest algorithm. @@ -17177,8 +17177,8 @@ Index: linux-2.4.35.4/fs/cifs/md5.c +} Index: linux-2.4.35.4/fs/cifs/md5.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/md5.h 2007-12-15 05:19:52.303401640 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/md5.h @@ -0,0 +1,38 @@ +#ifndef MD5_H +#define MD5_H @@ -17220,8 +17220,8 @@ Index: linux-2.4.35.4/fs/cifs/md5.h + unsigned char *digest); Index: linux-2.4.35.4/fs/cifs/misc.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/misc.c 2007-12-15 05:19:52.307401866 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/misc.c @@ -0,0 +1,463 @@ +/* + * fs/cifs/misc.c @@ -17688,8 +17688,8 @@ Index: linux-2.4.35.4/fs/cifs/misc.c +} Index: linux-2.4.35.4/fs/cifs/netmisc.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/netmisc.c 2007-12-15 05:19:52.307401866 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/netmisc.c @@ -0,0 +1,905 @@ +/* + * fs/cifs/netmisc.c @@ -18598,8 +18598,8 @@ Index: linux-2.4.35.4/fs/cifs/netmisc.c +} Index: linux-2.4.35.4/fs/cifs/nterr.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/nterr.c 2007-12-15 05:19:52.307401866 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/nterr.c @@ -0,0 +1,687 @@ +/* + * Unix SMB/Netbios implementation. @@ -19290,8 +19290,8 @@ Index: linux-2.4.35.4/fs/cifs/nterr.c +}; Index: linux-2.4.35.4/fs/cifs/nterr.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/nterr.h 2007-12-15 05:19:52.311402095 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/nterr.h @@ -0,0 +1,556 @@ +/* + Unix SMB/Netbios implementation. @@ -19851,8 +19851,8 @@ Index: linux-2.4.35.4/fs/cifs/nterr.h +#endif /* _NTERR_H */ Index: linux-2.4.35.4/fs/cifs/ntlmssp.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/ntlmssp.h 2007-12-15 05:19:52.311402095 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/ntlmssp.h @@ -0,0 +1,101 @@ +/* + * fs/cifs/ntlmssp.h @@ -19957,8 +19957,8 @@ Index: linux-2.4.35.4/fs/cifs/ntlmssp.h +#pragma pack() /* resume default structure packing */ Index: linux-2.4.35.4/fs/cifs/README =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/README 2007-12-15 05:19:52.311402095 +0100 +--- /dev/null ++++ linux-2.4.35.4/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. @@ -20318,8 +20318,8 @@ Index: linux-2.4.35.4/fs/cifs/README +complete in the CIFS VFS yet). Index: linux-2.4.35.4/fs/cifs/rfc1002pdu.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/rfc1002pdu.h 2007-12-15 05:19:52.311402095 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/rfc1002pdu.h @@ -0,0 +1,79 @@ +/* + * fs/cifs/rfc1002pdu.h @@ -20402,8 +20402,8 @@ Index: linux-2.4.35.4/fs/cifs/rfc1002pdu.h + Index: linux-2.4.35.4/fs/cifs/smbdes.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/smbdes.c 2007-12-15 05:19:52.315402324 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/smbdes.c @@ -0,0 +1,408 @@ +/* + Unix SMB/Netbios implementation. @@ -20815,8 +20815,8 @@ Index: linux-2.4.35.4/fs/cifs/smbdes.c +} Index: linux-2.4.35.4/fs/cifs/smbencrypt.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/smbencrypt.c 2007-12-15 05:19:52.315402324 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/smbencrypt.c @@ -0,0 +1,295 @@ +/* + Unix SMB/Netbios implementation. @@ -21115,8 +21115,8 @@ Index: linux-2.4.35.4/fs/cifs/smbencrypt.c +} Index: linux-2.4.35.4/fs/cifs/smberr.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/smberr.c 2007-12-15 05:19:52.315402324 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/smberr.c @@ -0,0 +1,240 @@ +/* + Unix SMB/Netbios implementation. @@ -21360,8 +21360,8 @@ Index: linux-2.4.35.4/fs/cifs/smberr.c +} Index: linux-2.4.35.4/fs/cifs/smberr.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/smberr.h 2007-12-15 05:19:52.315402324 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/smberr.h @@ -0,0 +1,113 @@ +/* + * fs/cifs/smberr.h @@ -21478,8 +21478,8 @@ Index: linux-2.4.35.4/fs/cifs/smberr.h +#define ERRnosupport 0xFFFF Index: linux-2.4.35.4/fs/cifs/TODO =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/TODO 2007-12-15 05:19:52.315402324 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/TODO @@ -0,0 +1,106 @@ +version 1.16 May 27, 2004 + @@ -21589,8 +21589,8 @@ Index: linux-2.4.35.4/fs/cifs/TODO + Index: linux-2.4.35.4/fs/cifs/transport.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/cifs/transport.c 2007-12-15 05:19:52.319402550 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/cifs/transport.c @@ -0,0 +1,434 @@ +/* + * fs/cifs/transport.c @@ -22028,9 +22028,9 @@ Index: linux-2.4.35.4/fs/cifs/transport.c +} Index: linux-2.4.35.4/fs/Config.in =================================================================== ---- linux-2.4.35.4.orig/fs/Config.in 2007-12-15 05:19:49.287229757 +0100 -+++ linux-2.4.35.4/fs/Config.in 2007-12-15 05:19:52.319402550 +0100 -@@ -153,6 +153,10 @@ +--- linux-2.4.35.4.orig/fs/Config.in ++++ linux-2.4.35.4/fs/Config.in +@@ -153,6 +153,10 @@ if [ "$CONFIG_NET" = "y" ]; then define_bool CONFIG_LOCKD_V4 y fi @@ -22043,9 +22043,9 @@ Index: linux-2.4.35.4/fs/Config.in 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 2007-12-15 05:19:48.639192828 +0100 -+++ linux-2.4.35.4/fs/Makefile 2007-12-15 05:19:52.319402550 +0100 -@@ -37,6 +37,7 @@ +--- linux-2.4.35.4.orig/fs/Makefile ++++ linux-2.4.35.4/fs/Makefile +@@ -37,6 +37,7 @@ subdir-$(CONFIG_MSDOS_FS) += msdos subdir-$(CONFIG_VFAT_FS) += vfat subdir-$(CONFIG_BFS_FS) += bfs subdir-$(CONFIG_ISO9660_FS) += isofs @@ -22055,9 +22055,9 @@ Index: linux-2.4.35.4/fs/Makefile 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 2007-12-15 05:19:42.058817832 +0100 -+++ linux-2.4.35.4/fs/nls/Config.in 2007-12-15 05:19:52.319402550 +0100 -@@ -11,6 +11,7 @@ +--- linux-2.4.35.4.orig/fs/nls/Config.in ++++ linux-2.4.35.4/fs/nls/Config.in +@@ -11,6 +11,7 @@ fi # msdos and Joliet want NLS if [ "$CONFIG_JOLIET" = "y" -o "$CONFIG_FAT_FS" != "n" \ diff --git a/target/linux/generic-2.4/patches/108-optional_aout_support.patch b/target/linux/generic-2.4/patches/108-optional_aout_support.patch index 5874007f59..0ae991d1d1 100644 --- a/target/linux/generic-2.4/patches/108-optional_aout_support.patch +++ b/target/linux/generic-2.4/patches/108-optional_aout_support.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help =================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:19:52.251398675 +0100 -+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:19:53.139449282 +0100 -@@ -4690,6 +4690,12 @@ +--- linux-2.4.35.4.orig/Documentation/Configure.help ++++ linux-2.4.35.4/Documentation/Configure.help +@@ -4690,6 +4690,12 @@ CONFIG_BINFMT_ELF ld.so (check the file <file:Documentation/Changes> for location and latest version). @@ -15,7 +15,7 @@ Index: linux-2.4.35.4/Documentation/Configure.help Kernel support for a.out binaries CONFIG_BINFMT_AOUT A.out (Assembler.OUTput) is a set of formats for libraries and -@@ -4703,13 +4709,11 @@ +@@ -4703,13 +4709,11 @@ CONFIG_BINFMT_AOUT warrant removing support. However its removal is a good idea if you wish to ensure that absolutely none of your programs will use this older executable format. If you don't know what to answer at this @@ -33,9 +33,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help CONFIG_OSF4_COMPAT Index: linux-2.4.35.4/arch/alpha/config.in =================================================================== ---- linux-2.4.35.4.orig/arch/alpha/config.in 2007-12-15 05:19:41.518787058 +0100 -+++ linux-2.4.35.4/arch/alpha/config.in 2007-12-15 05:19:53.143449511 +0100 -@@ -315,6 +315,9 @@ +--- linux-2.4.35.4.orig/arch/alpha/config.in ++++ linux-2.4.35.4/arch/alpha/config.in +@@ -315,6 +315,9 @@ if [ "$CONFIG_BINFMT_AOUT" != "n" ]; the fi bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF @@ -47,9 +47,9 @@ Index: linux-2.4.35.4/arch/alpha/config.in source drivers/parport/Config.in Index: linux-2.4.35.4/arch/alpha/defconfig =================================================================== ---- linux-2.4.35.4.orig/arch/alpha/defconfig 2007-12-15 05:19:41.526787516 +0100 -+++ linux-2.4.35.4/arch/alpha/defconfig 2007-12-15 05:19:53.143449511 +0100 -@@ -72,6 +72,7 @@ +--- linux-2.4.35.4.orig/arch/alpha/defconfig ++++ linux-2.4.35.4/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_ELF=y @@ -59,9 +59,9 @@ Index: linux-2.4.35.4/arch/alpha/defconfig Index: linux-2.4.35.4/arch/arm/config.in =================================================================== ---- linux-2.4.35.4.orig/arch/arm/config.in 2007-12-15 05:19:41.534787971 +0100 -+++ linux-2.4.35.4/arch/arm/config.in 2007-12-15 05:19:53.143449511 +0100 -@@ -499,6 +499,9 @@ +--- linux-2.4.35.4.orig/arch/arm/config.in ++++ linux-2.4.35.4/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 bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF @@ -73,9 +73,9 @@ Index: linux-2.4.35.4/arch/arm/config.in 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 2007-12-15 05:19:41.542788427 +0100 -+++ linux-2.4.35.4/arch/arm/defconfig 2007-12-15 05:19:53.143449511 +0100 -@@ -83,8 +83,9 @@ +--- linux-2.4.35.4.orig/arch/arm/defconfig ++++ linux-2.4.35.4/arch/arm/defconfig +@@ -83,8 +83,9 @@ CONFIG_SYSCTL=y CONFIG_NWFPE=y CONFIG_KCORE_ELF=y # CONFIG_KCORE_AOUT is not set @@ -88,9 +88,9 @@ Index: linux-2.4.35.4/arch/arm/defconfig # 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 2007-12-15 05:19:41.550788882 +0100 -+++ linux-2.4.35.4/arch/cris/config.in 2007-12-15 05:19:53.143449511 +0100 -@@ -31,6 +31,9 @@ +--- linux-2.4.35.4.orig/arch/cris/config.in ++++ linux-2.4.35.4/arch/cris/config.in +@@ -31,6 +31,9 @@ bool 'BSD Process Accounting' CONFIG_BSD bool 'Sysctl support' CONFIG_SYSCTL bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF @@ -102,9 +102,9 @@ Index: linux-2.4.35.4/arch/cris/config.in Index: linux-2.4.35.4/arch/cris/defconfig =================================================================== ---- linux-2.4.35.4.orig/arch/cris/defconfig 2007-12-15 05:19:41.554789111 +0100 -+++ linux-2.4.35.4/arch/cris/defconfig 2007-12-15 05:19:53.147449737 +0100 -@@ -18,6 +18,7 @@ +--- linux-2.4.35.4.orig/arch/cris/defconfig ++++ linux-2.4.35.4/arch/cris/defconfig +@@ -18,6 +18,7 @@ CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_SYSCTL is not set CONFIG_BINFMT_ELF=y @@ -114,9 +114,9 @@ Index: linux-2.4.35.4/arch/cris/defconfig Index: linux-2.4.35.4/arch/i386/config.in =================================================================== ---- linux-2.4.35.4.orig/arch/i386/config.in 2007-12-15 05:19:41.562789566 +0100 -+++ linux-2.4.35.4/arch/i386/config.in 2007-12-15 05:19:53.147449737 +0100 -@@ -329,6 +329,9 @@ +--- linux-2.4.35.4.orig/arch/i386/config.in ++++ linux-2.4.35.4/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 bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF @@ -128,9 +128,9 @@ Index: linux-2.4.35.4/arch/i386/config.in Index: linux-2.4.35.4/arch/i386/defconfig =================================================================== ---- linux-2.4.35.4.orig/arch/i386/defconfig 2007-12-15 05:19:41.570790022 +0100 -+++ linux-2.4.35.4/arch/i386/defconfig 2007-12-15 05:19:53.147449737 +0100 -@@ -115,9 +115,10 @@ +--- linux-2.4.35.4.orig/arch/i386/defconfig ++++ linux-2.4.35.4/arch/i386/defconfig +@@ -115,9 +115,10 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y CONFIG_KCORE_ELF=y # CONFIG_KCORE_AOUT is not set @@ -145,9 +145,9 @@ Index: linux-2.4.35.4/arch/i386/defconfig # 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 2007-12-15 05:19:41.578790477 +0100 -+++ linux-2.4.35.4/arch/ia64/config.in 2007-12-15 05:19:53.147449737 +0100 -@@ -124,6 +124,9 @@ +--- linux-2.4.35.4.orig/arch/ia64/config.in ++++ linux-2.4.35.4/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 bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF @@ -159,9 +159,9 @@ Index: linux-2.4.35.4/arch/ia64/config.in 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 2007-12-15 05:19:41.586790935 +0100 -+++ linux-2.4.35.4/arch/ia64/defconfig 2007-12-15 05:19:53.151449966 +0100 -@@ -60,6 +60,7 @@ +--- linux-2.4.35.4.orig/arch/ia64/defconfig ++++ linux-2.4.35.4/arch/ia64/defconfig +@@ -60,6 +60,7 @@ CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y CONFIG_BINFMT_ELF=y @@ -171,9 +171,9 @@ Index: linux-2.4.35.4/arch/ia64/defconfig CONFIG_ACPI_EFI=y Index: linux-2.4.35.4/arch/m68k/config.in =================================================================== ---- linux-2.4.35.4.orig/arch/m68k/config.in 2007-12-15 05:19:41.594791391 +0100 -+++ linux-2.4.35.4/arch/m68k/config.in 2007-12-15 05:19:53.151449966 +0100 -@@ -99,6 +99,9 @@ +--- linux-2.4.35.4.orig/arch/m68k/config.in ++++ linux-2.4.35.4/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 bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF @@ -185,9 +185,9 @@ Index: linux-2.4.35.4/arch/m68k/config.in if [ "$CONFIG_AMIGA" = "y" ]; then Index: linux-2.4.35.4/arch/m68k/defconfig =================================================================== ---- linux-2.4.35.4.orig/arch/m68k/defconfig 2007-12-15 05:19:41.602791846 +0100 -+++ linux-2.4.35.4/arch/m68k/defconfig 2007-12-15 05:19:53.151449966 +0100 -@@ -44,8 +44,9 @@ +--- linux-2.4.35.4.orig/arch/m68k/defconfig ++++ linux-2.4.35.4/arch/m68k/defconfig +@@ -44,8 +44,9 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y CONFIG_KCORE_ELF=y # CONFIG_KCORE_AOUT is not set @@ -200,9 +200,9 @@ Index: linux-2.4.35.4/arch/m68k/defconfig # 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 2007-12-15 05:19:44.814974898 +0100 -+++ linux-2.4.35.4/arch/mips/config-shared.in 2007-12-15 05:19:53.151449966 +0100 -@@ -873,6 +873,9 @@ +--- linux-2.4.35.4.orig/arch/mips/config-shared.in ++++ linux-2.4.35.4/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 bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF @@ -214,9 +214,9 @@ Index: linux-2.4.35.4/arch/mips/config-shared.in 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 2007-12-15 05:19:44.814974898 +0100 -+++ linux-2.4.35.4/arch/mips/defconfig 2007-12-15 05:19:53.155450196 +0100 -@@ -143,6 +143,7 @@ +--- linux-2.4.35.4.orig/arch/mips/defconfig ++++ linux-2.4.35.4/arch/mips/defconfig +@@ -143,6 +143,7 @@ CONFIG_KCORE_ELF=y # CONFIG_KCORE_AOUT is not set # CONFIG_BINFMT_AOUT is not set CONFIG_BINFMT_ELF=y @@ -226,8 +226,8 @@ Index: linux-2.4.35.4/arch/mips/defconfig # 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 2007-12-15 05:19:41.626793215 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/irixelf.c 2007-12-15 05:19:53.155450196 +0100 +--- linux-2.4.35.4.orig/arch/mips/kernel/irixelf.c ++++ linux-2.4.35.4/arch/mips/kernel/irixelf.c @@ -8,6 +8,7 @@ * Copyright 1993, 1994: Eric Youngdale (ericy@cais.com). */ @@ -236,7 +236,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/irixelf.c #include <linux/module.h> #include <linux/fs.h> -@@ -48,7 +49,12 @@ +@@ -48,7 +49,12 @@ static int irix_core_dump(long signr, st extern int dump_fpu (elf_fpregset_t *); static struct linux_binfmt irix_format = { @@ -250,7 +250,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/irixelf.c irix_core_dump, PAGE_SIZE }; -@@ -794,6 +800,7 @@ +@@ -794,6 +800,7 @@ out_free_ph: goto out; } @@ -258,7 +258,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/irixelf.c /* This is really simpleminded and specialized - we are loading an * a.out library that is given an ELF header. */ -@@ -873,6 +880,7 @@ +@@ -873,6 +880,7 @@ static int load_irix_library(struct file kfree(elf_phdata); return 0; } @@ -268,9 +268,9 @@ Index: linux-2.4.35.4/arch/mips/kernel/irixelf.c * 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 2007-12-15 05:19:44.874978317 +0100 -+++ linux-2.4.35.4/arch/mips64/defconfig 2007-12-15 05:19:53.155450196 +0100 -@@ -147,6 +147,7 @@ +--- linux-2.4.35.4.orig/arch/mips64/defconfig ++++ linux-2.4.35.4/arch/mips64/defconfig +@@ -147,6 +147,7 @@ CONFIG_KCORE_ELF=y # CONFIG_KCORE_AOUT is not set # CONFIG_BINFMT_AOUT is not set CONFIG_BINFMT_ELF=y @@ -280,9 +280,9 @@ Index: linux-2.4.35.4/arch/mips64/defconfig # 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 2007-12-15 05:19:41.638793897 +0100 -+++ linux-2.4.35.4/arch/parisc/config.in 2007-12-15 05:19:53.155450196 +0100 -@@ -89,6 +89,9 @@ +--- linux-2.4.35.4.orig/arch/parisc/config.in ++++ linux-2.4.35.4/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 bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF @@ -294,9 +294,9 @@ Index: linux-2.4.35.4/arch/parisc/config.in Index: linux-2.4.35.4/arch/parisc/defconfig =================================================================== ---- linux-2.4.35.4.orig/arch/parisc/defconfig 2007-12-15 05:19:41.646794355 +0100 -+++ linux-2.4.35.4/arch/parisc/defconfig 2007-12-15 05:19:53.159450422 +0100 -@@ -56,6 +56,7 @@ +--- linux-2.4.35.4.orig/arch/parisc/defconfig ++++ linux-2.4.35.4/arch/parisc/defconfig +@@ -56,6 +56,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y CONFIG_KCORE_ELF=y CONFIG_BINFMT_ELF=y @@ -306,9 +306,9 @@ Index: linux-2.4.35.4/arch/parisc/defconfig # 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 2007-12-15 05:19:41.654794810 +0100 -+++ linux-2.4.35.4/arch/ppc/config.in 2007-12-15 05:19:53.159450422 +0100 -@@ -384,6 +384,7 @@ +--- linux-2.4.35.4.orig/arch/ppc/config.in ++++ linux-2.4.35.4/arch/ppc/config.in +@@ -384,6 +384,7 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then fi define_bool CONFIG_BINFMT_ELF y define_bool CONFIG_KERNEL_ELF y @@ -318,9 +318,9 @@ Index: linux-2.4.35.4/arch/ppc/config.in Index: linux-2.4.35.4/arch/ppc/defconfig =================================================================== ---- linux-2.4.35.4.orig/arch/ppc/defconfig 2007-12-15 05:19:41.662795265 +0100 -+++ linux-2.4.35.4/arch/ppc/defconfig 2007-12-15 05:19:53.159450422 +0100 -@@ -59,7 +59,8 @@ +--- linux-2.4.35.4.orig/arch/ppc/defconfig ++++ linux-2.4.35.4/arch/ppc/defconfig +@@ -59,7 +59,8 @@ CONFIG_SYSVIPC=y CONFIG_KCORE_ELF=y CONFIG_BINFMT_ELF=y CONFIG_KERNEL_ELF=y @@ -332,9 +332,9 @@ Index: linux-2.4.35.4/arch/ppc/defconfig CONFIG_HOTPLUG=y Index: linux-2.4.35.4/arch/ppc64/config.in =================================================================== ---- linux-2.4.35.4.orig/arch/ppc64/config.in 2007-12-15 05:19:41.670795721 +0100 -+++ linux-2.4.35.4/arch/ppc64/config.in 2007-12-15 05:19:53.159450422 +0100 -@@ -82,6 +82,9 @@ +--- linux-2.4.35.4.orig/arch/ppc64/config.in ++++ linux-2.4.35.4/arch/ppc64/config.in +@@ -82,6 +82,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then fi bool 'Kernel support for 64 bit ELF binaries' CONFIG_BINFMT_ELF @@ -346,9 +346,9 @@ Index: linux-2.4.35.4/arch/ppc64/config.in Index: linux-2.4.35.4/arch/ppc64/defconfig =================================================================== ---- linux-2.4.35.4.orig/arch/ppc64/defconfig 2007-12-15 05:19:41.678796176 +0100 -+++ linux-2.4.35.4/arch/ppc64/defconfig 2007-12-15 05:19:53.163450651 +0100 -@@ -56,6 +56,7 @@ +--- linux-2.4.35.4.orig/arch/ppc64/defconfig ++++ linux-2.4.35.4/arch/ppc64/defconfig +@@ -56,6 +56,7 @@ CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_KCORE_ELF=y CONFIG_BINFMT_ELF=y @@ -358,9 +358,9 @@ Index: linux-2.4.35.4/arch/ppc64/defconfig CONFIG_PCI_NAMES=y Index: linux-2.4.35.4/arch/s390/config.in =================================================================== ---- linux-2.4.35.4.orig/arch/s390/config.in 2007-12-15 05:19:41.686796634 +0100 -+++ linux-2.4.35.4/arch/s390/config.in 2007-12-15 05:19:53.163450651 +0100 -@@ -58,6 +58,9 @@ +--- linux-2.4.35.4.orig/arch/s390/config.in ++++ linux-2.4.35.4/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 bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF @@ -372,9 +372,9 @@ Index: linux-2.4.35.4/arch/s390/config.in 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 2007-12-15 05:19:41.694797090 +0100 -+++ linux-2.4.35.4/arch/s390/defconfig 2007-12-15 05:19:53.163450651 +0100 -@@ -46,6 +46,7 @@ +--- linux-2.4.35.4.orig/arch/s390/defconfig ++++ linux-2.4.35.4/arch/s390/defconfig +@@ -46,6 +46,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y CONFIG_KCORE_ELF=y CONFIG_BINFMT_ELF=y @@ -384,9 +384,9 @@ Index: linux-2.4.35.4/arch/s390/defconfig CONFIG_PFAULT=y Index: linux-2.4.35.4/arch/s390x/config.in =================================================================== ---- linux-2.4.35.4.orig/arch/s390x/config.in 2007-12-15 05:19:41.698797316 +0100 -+++ linux-2.4.35.4/arch/s390x/config.in 2007-12-15 05:19:53.163450651 +0100 -@@ -61,6 +61,9 @@ +--- linux-2.4.35.4.orig/arch/s390x/config.in ++++ linux-2.4.35.4/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 bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF @@ -398,9 +398,9 @@ Index: linux-2.4.35.4/arch/s390x/config.in 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 2007-12-15 05:19:41.706797774 +0100 -+++ linux-2.4.35.4/arch/s390x/defconfig 2007-12-15 05:19:53.163450651 +0100 -@@ -47,6 +47,7 @@ +--- linux-2.4.35.4.orig/arch/s390x/defconfig ++++ linux-2.4.35.4/arch/s390x/defconfig +@@ -47,6 +47,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y CONFIG_KCORE_ELF=y CONFIG_BINFMT_ELF=y @@ -410,9 +410,9 @@ Index: linux-2.4.35.4/arch/s390x/defconfig CONFIG_PFAULT=y Index: linux-2.4.35.4/arch/sh/config.in =================================================================== ---- linux-2.4.35.4.orig/arch/sh/config.in 2007-12-15 05:19:41.714798229 +0100 -+++ linux-2.4.35.4/arch/sh/config.in 2007-12-15 05:19:53.163450651 +0100 -@@ -283,6 +283,9 @@ +--- linux-2.4.35.4.orig/arch/sh/config.in ++++ linux-2.4.35.4/arch/sh/config.in +@@ -283,6 +283,9 @@ if [ "$CONFIG_PROC_FS" = "y" ]; then A.OUT CONFIG_KCORE_AOUT" ELF fi bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF @@ -424,9 +424,9 @@ Index: linux-2.4.35.4/arch/sh/config.in 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 2007-12-15 05:19:41.722798685 +0100 -+++ linux-2.4.35.4/arch/sh/defconfig 2007-12-15 05:19:53.167450880 +0100 -@@ -48,6 +48,7 @@ +--- linux-2.4.35.4.orig/arch/sh/defconfig ++++ linux-2.4.35.4/arch/sh/defconfig +@@ -48,6 +48,7 @@ CONFIG_CF_ENABLER=y CONFIG_KCORE_ELF=y # CONFIG_KCORE_AOUT is not set CONFIG_BINFMT_ELF=y @@ -436,9 +436,9 @@ Index: linux-2.4.35.4/arch/sh/defconfig # Index: linux-2.4.35.4/arch/sparc/config.in =================================================================== ---- linux-2.4.35.4.orig/arch/sparc/config.in 2007-12-15 05:19:41.730799140 +0100 -+++ linux-2.4.35.4/arch/sparc/config.in 2007-12-15 05:19:53.167450880 +0100 -@@ -74,6 +74,9 @@ +--- linux-2.4.35.4.orig/arch/sparc/config.in ++++ linux-2.4.35.4/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 bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF @@ -450,9 +450,9 @@ Index: linux-2.4.35.4/arch/sparc/config.in 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 2007-12-15 05:19:41.738799596 +0100 -+++ linux-2.4.35.4/arch/sparc/defconfig 2007-12-15 05:19:53.167450880 +0100 -@@ -49,9 +49,10 @@ +--- linux-2.4.35.4.orig/arch/sparc/defconfig ++++ linux-2.4.35.4/arch/sparc/defconfig +@@ -49,9 +49,10 @@ CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y CONFIG_KCORE_ELF=y @@ -467,9 +467,9 @@ Index: linux-2.4.35.4/arch/sparc/defconfig Index: linux-2.4.35.4/arch/sparc64/config.in =================================================================== ---- linux-2.4.35.4.orig/arch/sparc64/config.in 2007-12-15 05:19:41.742799824 +0100 -+++ linux-2.4.35.4/arch/sparc64/config.in 2007-12-15 05:19:53.167450880 +0100 -@@ -79,6 +79,9 @@ +--- linux-2.4.35.4.orig/arch/sparc64/config.in ++++ linux-2.4.35.4/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 bool 'Kernel support for 64-bit ELF binaries' CONFIG_BINFMT_ELF @@ -481,9 +481,9 @@ Index: linux-2.4.35.4/arch/sparc64/config.in if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then Index: linux-2.4.35.4/arch/sparc64/defconfig =================================================================== ---- linux-2.4.35.4.orig/arch/sparc64/defconfig 2007-12-15 05:19:41.750800280 +0100 -+++ linux-2.4.35.4/arch/sparc64/defconfig 2007-12-15 05:19:53.167450880 +0100 -@@ -70,7 +70,8 @@ +--- linux-2.4.35.4.orig/arch/sparc64/defconfig ++++ linux-2.4.35.4/arch/sparc64/defconfig +@@ -70,7 +70,8 @@ CONFIG_SPARC32_COMPAT=y CONFIG_BINFMT_ELF32=y # CONFIG_BINFMT_AOUT32 is not set CONFIG_BINFMT_ELF=y @@ -495,9 +495,9 @@ Index: linux-2.4.35.4/arch/sparc64/defconfig # 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 2007-12-15 05:19:41.758800735 +0100 -+++ linux-2.4.35.4/arch/x86_64/config.in 2007-12-15 05:19:53.171451107 +0100 -@@ -118,6 +118,9 @@ +--- linux-2.4.35.4.orig/arch/x86_64/config.in ++++ linux-2.4.35.4/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 bool 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF @@ -509,9 +509,9 @@ Index: linux-2.4.35.4/arch/x86_64/config.in 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 2007-12-15 05:19:41.766801193 +0100 -+++ linux-2.4.35.4/arch/x86_64/defconfig 2007-12-15 05:19:53.171451107 +0100 -@@ -67,6 +67,7 @@ +--- linux-2.4.35.4.orig/arch/x86_64/defconfig ++++ linux-2.4.35.4/arch/x86_64/defconfig +@@ -67,6 +67,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSCTL=y CONFIG_KCORE_ELF=y CONFIG_BINFMT_ELF=y @@ -521,8 +521,8 @@ Index: linux-2.4.35.4/arch/x86_64/defconfig CONFIG_IA32_EMULATION=y Index: linux-2.4.35.4/fs/binfmt_elf.c =================================================================== ---- linux-2.4.35.4.orig/fs/binfmt_elf.c 2007-12-15 05:19:45.006985841 +0100 -+++ linux-2.4.35.4/fs/binfmt_elf.c 2007-12-15 05:19:53.171451107 +0100 +--- linux-2.4.35.4.orig/fs/binfmt_elf.c ++++ linux-2.4.35.4/fs/binfmt_elf.c @@ -9,6 +9,7 @@ * Copyright 1993, 1994: Eric Youngdale (ericy@cais.com). */ @@ -541,7 +541,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int); extern int dump_fpu (struct pt_regs *, elf_fpregset_t *); extern void dump_thread(struct pt_regs *, struct user *); -@@ -74,7 +77,13 @@ +@@ -74,7 +77,13 @@ static int elf_core_dump(long signr, str #define ELF_PAGEALIGN(_v) (((_v) + ELF_MIN_ALIGN - 1) & ~(ELF_MIN_ALIGN - 1)) static struct linux_binfmt elf_format = { @@ -556,7 +556,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c }; #define BAD_ADDR(x) ((unsigned long)(x) >= TASK_SIZE) -@@ -404,6 +413,7 @@ +@@ -404,6 +413,7 @@ out: return error; } @@ -564,7 +564,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c static unsigned long load_aout_interp(struct exec * interp_ex, struct file * interpreter) { -@@ -451,6 +461,7 @@ +@@ -451,6 +461,7 @@ static unsigned long load_aout_interp(st out: return elf_entry; } @@ -572,7 +572,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c /* * These are the functions used to load ELF style executables and shared -@@ -458,7 +469,9 @@ +@@ -458,7 +469,9 @@ out: */ #define INTERPRETER_NONE 0 @@ -582,7 +582,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c #define INTERPRETER_ELF 2 -@@ -482,7 +495,9 @@ +@@ -482,7 +495,9 @@ static int load_elf_binary(struct linux_ struct elfhdr elf_ex; struct elfhdr interp_elf_ex; struct exec interp_ex; @@ -592,7 +592,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c struct files_struct *files; /* Get the exec-header */ -@@ -612,6 +627,7 @@ +@@ -612,6 +627,7 @@ static int load_elf_binary(struct linux_ /* Some simple consistency checks for the interpreter */ if (elf_interpreter) { @@ -600,7 +600,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c interpreter_type = INTERPRETER_ELF | INTERPRETER_AOUT; /* Now figure out which format our binary is */ -@@ -619,6 +635,9 @@ +@@ -619,6 +635,9 @@ static int load_elf_binary(struct linux_ (N_MAGIC(interp_ex) != ZMAGIC) && (N_MAGIC(interp_ex) != QMAGIC)) interpreter_type = INTERPRETER_ELF; @@ -610,7 +610,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c if (memcmp(interp_elf_ex.e_ident, ELFMAG, SELFMAG) != 0) interpreter_type &= ~INTERPRETER_ELF; -@@ -627,6 +646,7 @@ +@@ -627,6 +646,7 @@ static int load_elf_binary(struct linux_ if (!interpreter_type) goto out_free_dentry; @@ -618,7 +618,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c /* Make sure only one type was selected */ if ((interpreter_type & INTERPRETER_ELF) && interpreter_type != INTERPRETER_ELF) { -@@ -634,6 +654,7 @@ +@@ -634,6 +654,7 @@ static int load_elf_binary(struct linux_ // printk(KERN_WARNING "ELF: Ambiguous type, using ELF\n"); interpreter_type = INTERPRETER_ELF; } @@ -626,7 +626,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c /* Verify the interpreter has a valid arch */ if ((interpreter_type == INTERPRETER_ELF) && !elf_check_arch(&interp_elf_ex)) -@@ -651,6 +672,7 @@ +@@ -651,6 +672,7 @@ static int load_elf_binary(struct linux_ /* OK, we are done with that, now set up the arg stuff, and then start this sucker up */ @@ -634,7 +634,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c if (!bprm->sh_bang) { char * passed_p; -@@ -669,6 +691,7 @@ +@@ -669,6 +691,7 @@ static int load_elf_binary(struct linux_ /* Executables without an interpreter also need a personality */ SET_PERSONALITY(elf_ex, ibcs2_interpreter); } @@ -642,7 +642,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c /* Flush all traces of the currently running executable */ retval = flush_old_exec(bprm); -@@ -817,10 +840,12 @@ +@@ -817,10 +840,12 @@ static int load_elf_binary(struct linux_ padzero(elf_bss); if (elf_interpreter) { @@ -655,7 +655,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c elf_entry = load_elf_interp(&interp_elf_ex, interpreter, &interp_load_addr); -@@ -849,7 +874,9 @@ +@@ -849,7 +874,9 @@ static int load_elf_binary(struct linux_ kfree(elf_phdata); @@ -665,7 +665,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c sys_close(elf_exec_fileno); set_binfmt(&elf_format); -@@ -863,10 +890,14 @@ +@@ -863,10 +890,14 @@ static int load_elf_binary(struct linux_ &elf_ex, load_addr, load_bias, interp_load_addr, @@ -680,7 +680,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c current->mm->start_brk = current->mm->brk = elf_brk; current->mm->end_code = end_code; current->mm->start_code = start_code; -@@ -937,9 +968,9 @@ +@@ -937,9 +968,9 @@ out_free_ph: goto out; } @@ -691,7 +691,7 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c static int load_elf_library(struct file *file) { struct elf_phdr *elf_phdata; -@@ -1016,6 +1047,7 @@ +@@ -1016,6 +1047,7 @@ out_free_ph: out: return error; } @@ -701,9 +701,9 @@ Index: linux-2.4.35.4/fs/binfmt_elf.c * 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 2007-12-15 05:19:41.786802333 +0100 -+++ linux-2.4.35.4/fs/exec.c 2007-12-15 05:19:53.175451333 +0100 -@@ -109,6 +109,7 @@ +--- linux-2.4.35.4.orig/fs/exec.c ++++ linux-2.4.35.4/fs/exec.c +@@ -109,6 +109,7 @@ static inline void put_binfmt(struct lin */ asmlinkage long sys_uselib(const char * library) { @@ -711,7 +711,7 @@ Index: linux-2.4.35.4/fs/exec.c struct file * file; struct nameidata nd; int error; -@@ -155,6 +156,9 @@ +@@ -155,6 +156,9 @@ out: exit: path_release(&nd); goto out; diff --git a/target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch b/target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch index 7df8263471..757df15e21 100644 --- a/target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch +++ b/target/linux/generic-2.4/patches/109-ipsec_nat_traversal.patch @@ -1,9 +1,9 @@ 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 2007-12-15 05:19:41.462783867 +0100 -+++ linux-2.4.35.4/include/net/sock.h 2007-12-15 05:19:53.815487806 +0100 -@@ -488,7 +488,13 @@ +--- linux-2.4.35.4.orig/include/net/sock.h ++++ linux-2.4.35.4/include/net/sock.h +@@ -488,7 +488,13 @@ struct tcp_opt { } bictcp; }; @@ -18,7 +18,7 @@ Index: linux-2.4.35.4/include/net/sock.h /* * This structure really needs to be cleaned up. * Most of it is for TCP, and not used by any of -@@ -655,6 +661,9 @@ +@@ -655,6 +661,9 @@ struct sock { #if defined(CONFIG_SPX) || defined (CONFIG_SPX_MODULE) struct spx_opt af_spx; #endif /* CONFIG_SPX */ @@ -30,9 +30,9 @@ Index: linux-2.4.35.4/include/net/sock.h Index: linux-2.4.35.4/net/Config.in =================================================================== ---- linux-2.4.35.4.orig/net/Config.in 2007-12-15 05:19:41.470784323 +0100 -+++ linux-2.4.35.4/net/Config.in 2007-12-15 05:19:53.819488035 +0100 -@@ -104,4 +104,6 @@ +--- linux-2.4.35.4.orig/net/Config.in ++++ linux-2.4.35.4/net/Config.in +@@ -104,4 +104,6 @@ comment 'Network testing' dep_tristate 'Packet Generator (USE WITH CAUTION)' CONFIG_NET_PKTGEN $CONFIG_PROC_FS endmenu @@ -41,9 +41,9 @@ Index: linux-2.4.35.4/net/Config.in endmenu Index: linux-2.4.35.4/net/ipv4/udp.c =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/udp.c 2007-12-15 05:19:41.482785007 +0100 -+++ linux-2.4.35.4/net/ipv4/udp.c 2007-12-15 05:19:53.823488264 +0100 -@@ -860,6 +860,9 @@ +--- linux-2.4.35.4.orig/net/ipv4/udp.c ++++ linux-2.4.35.4/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) { @@ -53,7 +53,7 @@ Index: linux-2.4.35.4/net/ipv4/udp.c /* * Charge it to the socket, dropping if the queue is full. */ -@@ -877,6 +880,40 @@ +@@ -877,6 +880,40 @@ static int udp_queue_rcv_skb(struct sock } #endif @@ -94,7 +94,7 @@ Index: linux-2.4.35.4/net/ipv4/udp.c if (sock_queue_rcv_skb(sk,skb)<0) { UDP_INC_STATS_BH(UdpInErrors); IP_INC_STATS_BH(IpInDiscards); -@@ -1100,13 +1137,49 @@ +@@ -1100,13 +1137,49 @@ out: return len; } diff --git a/target/linux/generic-2.4/patches/110-netdev_random_core.patch b/target/linux/generic-2.4/patches/110-netdev_random_core.patch index e87e0e9d58..e088949c44 100644 --- a/target/linux/generic-2.4/patches/110-netdev_random_core.patch +++ b/target/linux/generic-2.4/patches/110-netdev_random_core.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help =================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:19:53.139449282 +0100 -+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:19:54.063501941 +0100 -@@ -10675,6 +10675,20 @@ +--- linux-2.4.35.4.orig/Documentation/Configure.help ++++ linux-2.4.35.4/Documentation/Configure.help +@@ -10675,6 +10675,20 @@ CONFIG_TUN If you don't know what to use this for, you don't need it. @@ -25,9 +25,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help 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 2007-12-15 05:19:51.931380439 +0100 -+++ linux-2.4.35.4/drivers/net/Config.in 2007-12-15 05:19:54.067502171 +0100 -@@ -8,6 +8,7 @@ +--- linux-2.4.35.4.orig/drivers/net/Config.in ++++ linux-2.4.35.4/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 tristate 'Universal TUN/TAP device driver support' CONFIG_TUN @@ -37,9 +37,9 @@ Index: linux-2.4.35.4/drivers/net/Config.in fi Index: linux-2.4.35.4/include/asm-alpha/signal.h =================================================================== ---- linux-2.4.35.4.orig/include/asm-alpha/signal.h 2007-12-15 05:19:41.318775660 +0100 -+++ linux-2.4.35.4/include/asm-alpha/signal.h 2007-12-15 05:19:54.067502171 +0100 -@@ -121,8 +121,15 @@ +--- linux-2.4.35.4.orig/include/asm-alpha/signal.h ++++ linux-2.4.35.4/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 SA_SHIRQ 0x40000000 @@ -57,9 +57,9 @@ Index: linux-2.4.35.4/include/asm-alpha/signal.h #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 2007-12-15 05:19:41.326776118 +0100 -+++ linux-2.4.35.4/include/asm-arm/signal.h 2007-12-15 05:19:54.067502171 +0100 -@@ -125,8 +125,15 @@ +--- linux-2.4.35.4.orig/include/asm-arm/signal.h ++++ linux-2.4.35.4/include/asm-arm/signal.h +@@ -125,8 +125,15 @@ typedef unsigned long sigset_t; #define SA_PROBE 0x80000000 #define SA_SAMPLE_RANDOM 0x10000000 #define SA_SHIRQ 0x04000000 @@ -77,9 +77,9 @@ Index: linux-2.4.35.4/include/asm-arm/signal.h #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 2007-12-15 05:19:41.334776573 +0100 -+++ linux-2.4.35.4/include/asm-cris/signal.h 2007-12-15 05:19:54.071502397 +0100 -@@ -120,8 +120,15 @@ +--- linux-2.4.35.4.orig/include/asm-cris/signal.h ++++ linux-2.4.35.4/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 SA_SHIRQ 0x04000000 @@ -97,9 +97,9 @@ Index: linux-2.4.35.4/include/asm-cris/signal.h #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 2007-12-15 05:19:41.338776800 +0100 -+++ linux-2.4.35.4/include/asm-i386/signal.h 2007-12-15 05:19:54.071502397 +0100 -@@ -119,8 +119,15 @@ +--- linux-2.4.35.4.orig/include/asm-i386/signal.h ++++ linux-2.4.35.4/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 SA_SHIRQ 0x04000000 @@ -117,8 +117,8 @@ Index: linux-2.4.35.4/include/asm-i386/signal.h #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 2007-12-15 05:19:41.350777484 +0100 -+++ linux-2.4.35.4/include/asm-ia64/signal.h 2007-12-15 05:19:54.071502397 +0100 +--- linux-2.4.35.4.orig/include/asm-ia64/signal.h ++++ linux-2.4.35.4/include/asm-ia64/signal.h @@ -117,6 +117,12 @@ #define SA_SHIRQ 0x04000000 #define SA_PERCPU_IRQ 0x02000000 @@ -134,9 +134,9 @@ Index: linux-2.4.35.4/include/asm-ia64/signal.h #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 2007-12-15 05:19:41.358777939 +0100 -+++ linux-2.4.35.4/include/asm-m68k/signal.h 2007-12-15 05:19:54.071502397 +0100 -@@ -116,8 +116,15 @@ +--- linux-2.4.35.4.orig/include/asm-m68k/signal.h ++++ linux-2.4.35.4/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 SA_SHIRQ 0x04000000 @@ -154,9 +154,9 @@ Index: linux-2.4.35.4/include/asm-m68k/signal.h #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 2007-12-15 05:19:41.366778397 +0100 -+++ linux-2.4.35.4/include/asm-mips/signal.h 2007-12-15 05:19:54.075502626 +0100 -@@ -111,6 +111,12 @@ +--- linux-2.4.35.4.orig/include/asm-mips/signal.h ++++ linux-2.4.35.4/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 @@ -171,9 +171,9 @@ Index: linux-2.4.35.4/include/asm-mips/signal.h #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 2007-12-15 05:19:41.374778853 +0100 -+++ linux-2.4.35.4/include/asm-mips64/signal.h 2007-12-15 05:19:54.075502626 +0100 -@@ -119,6 +119,12 @@ +--- linux-2.4.35.4.orig/include/asm-mips64/signal.h ++++ linux-2.4.35.4/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 @@ -188,8 +188,8 @@ Index: linux-2.4.35.4/include/asm-mips64/signal.h #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 2007-12-15 05:19:41.382779308 +0100 -+++ linux-2.4.35.4/include/asm-parisc/signal.h 2007-12-15 05:19:54.075502626 +0100 +--- linux-2.4.35.4.orig/include/asm-parisc/signal.h ++++ linux-2.4.35.4/include/asm-parisc/signal.h @@ -100,6 +100,12 @@ #define SA_SAMPLE_RANDOM SA_RESTART #define SA_SHIRQ 0x04000000 @@ -205,9 +205,9 @@ Index: linux-2.4.35.4/include/asm-parisc/signal.h #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 2007-12-15 05:19:41.390779764 +0100 -+++ linux-2.4.35.4/include/asm-ppc/signal.h 2007-12-15 05:19:54.075502626 +0100 -@@ -111,6 +111,13 @@ +--- linux-2.4.35.4.orig/include/asm-ppc/signal.h ++++ linux-2.4.35.4/include/asm-ppc/signal.h +@@ -111,6 +111,13 @@ typedef struct { #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART #define SA_SHIRQ 0x04000000 @@ -223,9 +223,9 @@ Index: linux-2.4.35.4/include/asm-ppc/signal.h #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 2007-12-15 05:19:41.398780219 +0100 -+++ linux-2.4.35.4/include/asm-s390/signal.h 2007-12-15 05:19:54.075502626 +0100 -@@ -129,8 +129,15 @@ +--- linux-2.4.35.4.orig/include/asm-s390/signal.h ++++ linux-2.4.35.4/include/asm-s390/signal.h +@@ -129,8 +129,15 @@ typedef unsigned long sigset_t; #define SA_SHIRQ 0x04000000 #define SA_DOPATHGROUP 0x00100000 #define SA_FORCE 0x00200000 @@ -243,9 +243,9 @@ Index: linux-2.4.35.4/include/asm-s390/signal.h #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 2007-12-15 05:19:41.406780677 +0100 -+++ linux-2.4.35.4/include/asm-s390x/signal.h 2007-12-15 05:19:54.079502852 +0100 -@@ -129,8 +129,15 @@ +--- linux-2.4.35.4.orig/include/asm-s390x/signal.h ++++ linux-2.4.35.4/include/asm-s390x/signal.h +@@ -129,8 +129,15 @@ typedef unsigned long sigset_t; #define SA_SHIRQ 0x04000000 #define SA_DOPATHGROUP 0x00100000 #define SA_FORCE 0x00200000 @@ -263,9 +263,9 @@ Index: linux-2.4.35.4/include/asm-s390x/signal.h #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 2007-12-15 05:19:41.414781133 +0100 -+++ linux-2.4.35.4/include/asm-sh/signal.h 2007-12-15 05:19:54.079502852 +0100 -@@ -107,8 +107,15 @@ +--- linux-2.4.35.4.orig/include/asm-sh/signal.h ++++ linux-2.4.35.4/include/asm-sh/signal.h +@@ -107,8 +107,15 @@ typedef struct { #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART #define SA_SHIRQ 0x04000000 @@ -283,9 +283,9 @@ Index: linux-2.4.35.4/include/asm-sh/signal.h #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 2007-12-15 05:19:41.422781588 +0100 -+++ linux-2.4.35.4/include/asm-sparc/signal.h 2007-12-15 05:19:54.079502852 +0100 -@@ -176,8 +176,15 @@ +--- linux-2.4.35.4.orig/include/asm-sparc/signal.h ++++ linux-2.4.35.4/include/asm-sparc/signal.h +@@ -176,8 +176,15 @@ struct sigstack { #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART #define SA_STATIC_ALLOC 0x80 @@ -303,9 +303,9 @@ Index: linux-2.4.35.4/include/asm-sparc/signal.h 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 2007-12-15 05:19:41.430782043 +0100 -+++ linux-2.4.35.4/include/asm-sparc64/signal.h 2007-12-15 05:19:54.079502852 +0100 -@@ -192,8 +192,15 @@ +--- linux-2.4.35.4.orig/include/asm-sparc64/signal.h ++++ linux-2.4.35.4/include/asm-sparc64/signal.h +@@ -192,8 +192,15 @@ struct sigstack { #define SA_PROBE SA_ONESHOT #define SA_SAMPLE_RANDOM SA_RESTART #define SA_STATIC_ALLOC 0x80 diff --git a/target/linux/generic-2.4/patches/112-bridging_performance.patch b/target/linux/generic-2.4/patches/112-bridging_performance.patch index 953154959b..daa396c848 100644 --- a/target/linux/generic-2.4/patches/112-bridging_performance.patch +++ b/target/linux/generic-2.4/patches/112-bridging_performance.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/net/core/dev.c =================================================================== ---- linux-2.4.35.4.orig/net/core/dev.c 2007-12-15 05:19:51.651364482 +0100 -+++ linux-2.4.35.4/net/core/dev.c 2007-12-15 05:19:54.483525877 +0100 -@@ -1289,6 +1289,19 @@ +--- linux-2.4.35.4.orig/net/core/dev.c ++++ linux-2.4.35.4/net/core/dev.c +@@ -1289,6 +1289,19 @@ int netif_rx(struct sk_buff *skb) local_irq_save(flags); netdev_rx_stat[this_cpu].total++; diff --git a/target/linux/generic-2.4/patches/113-even_more_gcc4_stuff.patch b/target/linux/generic-2.4/patches/113-even_more_gcc4_stuff.patch index 853b776f1e..b5ae881a45 100644 --- a/target/linux/generic-2.4/patches/113-even_more_gcc4_stuff.patch +++ b/target/linux/generic-2.4/patches/113-even_more_gcc4_stuff.patch @@ -1,7 +1,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/mips_ksyms.c 2007-12-15 05:19:41.186768139 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c 2007-12-15 05:19:54.695537960 +0100 +--- linux-2.4.35.4.orig/arch/mips/kernel/mips_ksyms.c ++++ linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c @@ -30,6 +30,10 @@ #include <asm/floppy.h> #endif @@ -13,7 +13,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c extern void *__bzero(void *__s, size_t __count); extern long __strncpy_from_user_nocheck_asm(char *__to, const char *__from, long __len); -@@ -78,6 +82,13 @@ +@@ -78,6 +82,13 @@ EXPORT_SYMBOL_NOVERS(__strnlen_user_noch EXPORT_SYMBOL_NOVERS(__strnlen_user_asm); @@ -29,9 +29,9 @@ Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c Index: linux-2.4.35.4/arch/mips/lib/Makefile =================================================================== ---- linux-2.4.35.4.orig/arch/mips/lib/Makefile 2007-12-15 05:19:41.194768595 +0100 -+++ linux-2.4.35.4/arch/mips/lib/Makefile 2007-12-15 05:19:54.699538186 +0100 -@@ -9,7 +9,8 @@ +--- linux-2.4.35.4.orig/arch/mips/lib/Makefile ++++ linux-2.4.35.4/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 \ memset.o watch.o strlen_user.o \ @@ -43,8 +43,8 @@ Index: linux-2.4.35.4/arch/mips/lib/Makefile Index: linux-2.4.35.4/arch/mips/lib/ashldi3.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/lib/ashldi3.c 2007-12-15 05:19:54.707538644 +0100 +--- /dev/null ++++ linux-2.4.35.4/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. @@ -110,8 +110,8 @@ Index: linux-2.4.35.4/arch/mips/lib/ashldi3.c +} Index: linux-2.4.35.4/arch/mips/lib/ashrdi3.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/lib/ashrdi3.c 2007-12-15 05:19:54.711538870 +0100 +--- /dev/null ++++ linux-2.4.35.4/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. @@ -178,8 +178,8 @@ Index: linux-2.4.35.4/arch/mips/lib/ashrdi3.c +} Index: linux-2.4.35.4/arch/mips/lib/lshrdi3.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/lib/lshrdi3.c 2007-12-15 05:19:54.715539100 +0100 +--- /dev/null ++++ linux-2.4.35.4/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. @@ -245,8 +245,8 @@ Index: linux-2.4.35.4/arch/mips/lib/lshrdi3.c +} Index: linux-2.4.35.4/arch/mips/lib/muldi3.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/arch/mips/lib/muldi3.c 2007-12-15 05:19:54.715539100 +0100 +--- /dev/null ++++ linux-2.4.35.4/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: */ @@ -313,8 +313,8 @@ Index: linux-2.4.35.4/arch/mips/lib/muldi3.c +} Index: linux-2.4.35.4/fs/cifs/cifsfs.c =================================================================== ---- linux-2.4.35.4.orig/fs/cifs/cifsfs.c 2007-12-15 05:19:52.279400271 +0100 -+++ linux-2.4.35.4/fs/cifs/cifsfs.c 2007-12-15 05:19:54.715539100 +0100 +--- linux-2.4.35.4.orig/fs/cifs/cifsfs.c ++++ linux-2.4.35.4/fs/cifs/cifsfs.c @@ -50,8 +50,6 @@ static struct quotactl_ops cifs_quotactl_ops; #endif @@ -326,9 +326,9 @@ Index: linux-2.4.35.4/fs/cifs/cifsfs.c 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 2007-12-15 05:19:41.238771101 +0100 -+++ linux-2.4.35.4/include/asm-mips/uaccess.h 2007-12-15 05:19:54.715539100 +0100 -@@ -149,7 +149,7 @@ +--- linux-2.4.35.4.orig/include/asm-mips/uaccess.h ++++ linux-2.4.35.4/include/asm-mips/uaccess.h +@@ -149,7 +149,7 @@ static inline int verify_area(int type, * Returns zero on success, or -EFAULT on error. */ #define put_user(x,ptr) \ @@ -337,7 +337,7 @@ Index: linux-2.4.35.4/include/asm-mips/uaccess.h /* * get_user: - Get a simple variable from user space. -@@ -169,7 +169,7 @@ +@@ -169,7 +169,7 @@ static inline int verify_area(int type, * On error, the variable @x is set to zero. */ #define get_user(x,ptr) \ @@ -346,7 +346,7 @@ Index: linux-2.4.35.4/include/asm-mips/uaccess.h /* * __put_user: - Write a simple value into user space, with less checking. -@@ -191,7 +191,7 @@ +@@ -191,7 +191,7 @@ static inline int verify_area(int type, * Returns zero on success, or -EFAULT on error. */ #define __put_user(x,ptr) \ @@ -355,7 +355,7 @@ Index: linux-2.4.35.4/include/asm-mips/uaccess.h /* * __get_user: - Get a simple variable from user space, with less checking. -@@ -214,7 +214,7 @@ +@@ -214,7 +214,7 @@ static inline int verify_area(int type, * On error, the variable @x is set to zero. */ #define __get_user(x,ptr) \ @@ -364,7 +364,7 @@ Index: linux-2.4.35.4/include/asm-mips/uaccess.h struct __large_struct { unsigned long buf[100]; }; #define __m(x) (*(struct __large_struct *)(x)) -@@ -232,7 +232,7 @@ +@@ -232,7 +232,7 @@ struct __large_struct { unsigned long bu #define __get_user_nocheck(x,ptr,size) \ ({ \ long __gu_err = 0; \ diff --git a/target/linux/generic-2.4/patches/114-sched_use_tsc.patch b/target/linux/generic-2.4/patches/114-sched_use_tsc.patch index 30f984476c..cb51a3f571 100644 --- a/target/linux/generic-2.4/patches/114-sched_use_tsc.patch +++ b/target/linux/generic-2.4/patches/114-sched_use_tsc.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/time.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/time.c 2007-12-15 05:19:41.138765402 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/time.c 2007-12-15 05:19:55.011555967 +0100 -@@ -151,6 +151,27 @@ +--- linux-2.4.35.4.orig/arch/mips/kernel/time.c ++++ linux-2.4.35.4/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); @@ -30,7 +30,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/time.c /* * timeofday services, for syscalls. -@@ -761,3 +782,5 @@ +@@ -761,3 +782,5 @@ EXPORT_SYMBOL(rtc_lock); EXPORT_SYMBOL(to_tm); EXPORT_SYMBOL(rtc_set_time); EXPORT_SYMBOL(rtc_get_time); @@ -38,9 +38,9 @@ Index: linux-2.4.35.4/arch/mips/kernel/time.c +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 2007-12-15 05:19:41.146765860 +0100 -+++ linux-2.4.35.4/include/asm-mips/timex.h 2007-12-15 05:19:55.015556197 +0100 -@@ -31,6 +31,19 @@ +--- linux-2.4.35.4.orig/include/asm-mips/timex.h ++++ linux-2.4.35.4/include/asm-mips/timex.h +@@ -31,6 +31,19 @@ static inline cycles_t get_cycles (void) return read_c0_count(); } @@ -62,8 +62,8 @@ Index: linux-2.4.35.4/include/asm-mips/timex.h Index: linux-2.4.35.4/include/net/pkt_sched.h =================================================================== ---- linux-2.4.35.4.orig/include/net/pkt_sched.h 2007-12-15 05:19:41.154766315 +0100 -+++ linux-2.4.35.4/include/net/pkt_sched.h 2007-12-15 05:19:55.023556652 +0100 +--- linux-2.4.35.4.orig/include/net/pkt_sched.h ++++ linux-2.4.35.4/include/net/pkt_sched.h @@ -5,7 +5,11 @@ #define PSCHED_JIFFIES 2 #define PSCHED_CPU 3 @@ -76,7 +76,7 @@ Index: linux-2.4.35.4/include/net/pkt_sched.h #include <linux/config.h> #include <linux/types.h> -@@ -261,7 +265,7 @@ +@@ -261,7 +265,7 @@ extern int psched_clock_scale; #define PSCHED_US2JIFFIE(delay) (((delay)+psched_clock_per_hz-1)/psched_clock_per_hz) #define PSCHED_JIFFIE2US(delay) ((delay)*psched_clock_per_hz) diff --git a/target/linux/generic-2.4/patches/115-branch_emul_fix.patch b/target/linux/generic-2.4/patches/115-branch_emul_fix.patch index 4bb25a1046..5d65ee8ef4 100644 --- a/target/linux/generic-2.4/patches/115-branch_emul_fix.patch +++ b/target/linux/generic-2.4/patches/115-branch_emul_fix.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/branch.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/branch.c 2007-12-15 05:19:41.102763351 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/branch.c 2007-12-15 05:19:55.259570100 +0100 -@@ -170,7 +170,7 @@ +--- linux-2.4.35.4.orig/arch/mips/kernel/branch.c ++++ linux-2.4.35.4/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); bit += 23; diff --git a/target/linux/generic-2.4/patches/116-bridge_ioctls.patch b/target/linux/generic-2.4/patches/116-bridge_ioctls.patch index 09e9152e6d..f42c02a1f6 100644 --- a/target/linux/generic-2.4/patches/116-bridge_ioctls.patch +++ b/target/linux/generic-2.4/patches/116-bridge_ioctls.patch @@ -1,7 +1,7 @@ Index: linux-2.4.35.4/include/linux/sockios.h =================================================================== ---- linux-2.4.35.4/include/linux/sockios.h 2008-02-10 23:23:00.102763351 +0100 -+++ linux-2.4.35.4.new/include/linux/sockios.h 2008-02-10 23:23:01.259570100 +0100 +--- linux-2.4.35.4.orig/include/linux/sockios.h ++++ linux-2.4.35.4/include/linux/sockios.h @@ -68,6 +68,11 @@ #define SIOCGIFBR 0x8940 /* Bridging support */ diff --git a/target/linux/generic-2.4/patches/200-i4l.patch b/target/linux/generic-2.4/patches/200-i4l.patch index 353e304df7..4c84cc5bdd 100644 --- a/target/linux/generic-2.4/patches/200-i4l.patch +++ b/target/linux/generic-2.4/patches/200-i4l.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/Documentation/isdn/CREDITS =================================================================== ---- linux-2.4.35.4.orig/Documentation/isdn/CREDITS 2007-12-15 05:19:39.346663275 +0100 -+++ linux-2.4.35.4/Documentation/isdn/CREDITS 2007-12-15 05:19:55.467581957 +0100 -@@ -37,7 +37,7 @@ +--- linux-2.4.35.4.orig/Documentation/isdn/CREDITS ++++ linux-2.4.35.4/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 @@ -13,9 +13,9 @@ Index: linux-2.4.35.4/Documentation/isdn/CREDITS 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 2007-12-15 05:19:39.354663733 +0100 -+++ linux-2.4.35.4/Documentation/isdn/HiSax.cert 2007-12-15 05:19:55.471582183 +0100 -@@ -68,6 +68,8 @@ +--- linux-2.4.35.4.orig/Documentation/isdn/HiSax.cert ++++ linux-2.4.35.4/Documentation/isdn/HiSax.cert +@@ -68,6 +68,8 @@ drivers/isdn/hisax/cert.c drivers/isdn/hisax/elsa.c drivers/isdn/hisax/diva.c drivers/isdn/hisax/hfc_pci.c @@ -26,15 +26,15 @@ Index: linux-2.4.35.4/Documentation/isdn/HiSax.cert them directly into the HiSax sources. Index: linux-2.4.35.4/Documentation/isdn/INTERFACE =================================================================== ---- linux-2.4.35.4.orig/Documentation/isdn/INTERFACE 2007-12-15 05:19:39.362664189 +0100 -+++ linux-2.4.35.4/Documentation/isdn/INTERFACE 2007-12-15 05:19:55.479582638 +0100 +--- linux-2.4.35.4.orig/Documentation/isdn/INTERFACE ++++ linux-2.4.35.4/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 $ Description of the Interface between Linklevel and Hardwarelevel of isdn4linux: -@@ -399,7 +399,7 @@ +@@ -399,7 +399,7 @@ Description of the Interface between Lin protocol-Id is one of the constants ISDN_PROTO_L3... parm.fax = Pointer to T30_s fax struct. (fax usage only) @@ -43,7 +43,7 @@ Index: linux-2.4.35.4/Documentation/isdn/INTERFACE With this command, the HL-driver is told to return the current setting of the Layer-3-protocol. -@@ -781,3 +781,22 @@ +@@ -781,3 +781,22 @@ Description of the Interface between Lin arg = channel-number, locally to the driver. (starting with 0) parm = unused. @@ -68,8 +68,8 @@ Index: linux-2.4.35.4/Documentation/isdn/INTERFACE + Index: linux-2.4.35.4/Documentation/isdn/INTERFACE.fax =================================================================== ---- linux-2.4.35.4.orig/Documentation/isdn/INTERFACE.fax 2007-12-15 05:19:39.366664415 +0100 -+++ linux-2.4.35.4/Documentation/isdn/INTERFACE.fax 2007-12-15 05:19:55.483582867 +0100 +--- linux-2.4.35.4.orig/Documentation/isdn/INTERFACE.fax ++++ linux-2.4.35.4/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 $ @@ -78,9 +78,9 @@ Index: linux-2.4.35.4/Documentation/isdn/INTERFACE.fax 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 2007-12-15 05:19:39.374664873 +0100 -+++ linux-2.4.35.4/Documentation/isdn/README 2007-12-15 05:19:55.487583097 +0100 -@@ -278,6 +278,12 @@ +--- linux-2.4.35.4.orig/Documentation/isdn/README ++++ linux-2.4.35.4/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 1 = Add CDN to RING/FCON message on @@ -95,9 +95,9 @@ Index: linux-2.4.35.4/Documentation/isdn/README 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 2007-12-15 05:19:39.382665329 +0100 -+++ linux-2.4.35.4/Documentation/isdn/README.HiSax 2007-12-15 05:19:55.487583097 +0100 -@@ -41,10 +41,9 @@ +--- linux-2.4.35.4.orig/Documentation/isdn/README.HiSax ++++ linux-2.4.35.4/Documentation/isdn/README.HiSax +@@ -41,10 +41,9 @@ ELSA Quickstep 3000 (same settings as QS ELSA Quickstep 3000PCI ELSA PCMCIA ITK ix1-micro Rev.2 @@ -111,7 +111,7 @@ Index: linux-2.4.35.4/Documentation/isdn/README.HiSax ASUSCOM NETWORK INC. ISDNLink 128K PC adapter (order code I-IN100-ST-D) Dynalink IS64PH (OEM version of ASUSCOM NETWORK INC. ISDNLink 128K adapter) PCBIT-DP (OEM version of ASUSCOM NETWORK INC. ISDNLink) -@@ -53,7 +52,6 @@ +@@ -53,7 +52,6 @@ Sedlbauer Speed Card (Speed Win, Teledat Sedlbauer Speed Star/Speed Star2 (PCMCIA) Sedlbauer ISDN-Controller PC/104 USR Sportster internal TA (compatible Stollmann tina-pp V3) @@ -119,7 +119,7 @@ Index: linux-2.4.35.4/Documentation/isdn/README.HiSax ith Kommunikationstechnik GmbH MIC 16 ISA card Traverse Technologie NETjet PCI S0 card and NETspider U card Ovislink ISDN sc100-p card (NETjet driver) -@@ -68,14 +66,14 @@ +@@ -68,14 +66,14 @@ Gazel ISDN cards HFC-PCI based cards Winbond W6692 based cards HFC-S+, HFC-SP/PCMCIA cards @@ -136,7 +136,7 @@ Index: linux-2.4.35.4/Documentation/isdn/README.HiSax You can combine any card, if there is no conflict between the resources (io, mem, irq). -@@ -91,15 +89,8 @@ +@@ -91,15 +89,8 @@ There is also some config needed before modules. It is included in the normal "make [menu]config" target at the kernel. Don't forget it, especially to select the right D-channel protocol. @@ -154,7 +154,7 @@ Index: linux-2.4.35.4/Documentation/isdn/README.HiSax a) when built as a module ------------------------- -@@ -200,8 +191,6 @@ +@@ -200,8 +191,6 @@ Card types: 37 HFC 2BDS0 S+, SP irq,io 38 NETspider U PCI card none 39 HFC 2BDS0 SP/PCMCIA irq,io (set with cardmgr) @@ -163,7 +163,7 @@ Index: linux-2.4.35.4/Documentation/isdn/README.HiSax At the moment IRQ sharing is only possible with PCI cards. Please make sure that your IRQ is free and enabled for ISA use. -@@ -227,13 +216,6 @@ +@@ -227,13 +216,6 @@ Examples for module loading (IO 1 (BASE 0x0180)) modprobe hisax type=4 protocol=2 irq=10 io0=0x580 io1=0x180 @@ -177,7 +177,7 @@ Index: linux-2.4.35.4/Documentation/isdn/README.HiSax 6. Teles 16.3, Euro ISDN, I/O base 280 hex, IRQ 12 and Teles 16.0, 1TR6, IRQ 5, Memory d0000 hex modprobe hisax type=3,1 protocol=2,1 io=0x280 mem=0,0xd0000 -@@ -314,9 +296,7 @@ +@@ -314,9 +296,7 @@ type 36 W6692 based PCI cards none 37 HFC 2BDS0 S+,SP/PCMCIA ONLY WORKS AS A MODULE ! 38 NETspider U PCI card none @@ -190,8 +190,8 @@ Index: linux-2.4.35.4/Documentation/isdn/README.HiSax ------------------ Index: linux-2.4.35.4/Documentation/isdn/README.act2000 =================================================================== ---- linux-2.4.35.4.orig/Documentation/isdn/README.act2000 2007-12-15 05:19:39.390665784 +0100 -+++ linux-2.4.35.4/Documentation/isdn/README.act2000 2007-12-15 05:19:55.487583097 +0100 +--- linux-2.4.35.4.orig/Documentation/isdn/README.act2000 ++++ linux-2.4.35.4/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 $ @@ -200,8 +200,8 @@ Index: linux-2.4.35.4/Documentation/isdn/README.act2000 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 2007-12-15 05:19:39.394666013 +0100 -+++ linux-2.4.35.4/Documentation/isdn/README.audio 2007-12-15 05:19:55.487583097 +0100 +--- linux-2.4.35.4.orig/Documentation/isdn/README.audio ++++ linux-2.4.35.4/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 $ @@ -210,8 +210,8 @@ Index: linux-2.4.35.4/Documentation/isdn/README.audio Description of audio mode. Index: linux-2.4.35.4/Documentation/isdn/README.eicon =================================================================== ---- linux-2.4.35.4.orig/Documentation/isdn/README.eicon 2007-12-15 05:19:39.402666468 +0100 -+++ linux-2.4.35.4/Documentation/isdn/README.eicon 2007-12-15 05:19:55.487583097 +0100 +--- linux-2.4.35.4.orig/Documentation/isdn/README.eicon ++++ linux-2.4.35.4/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 $ @@ -220,8 +220,8 @@ Index: linux-2.4.35.4/Documentation/isdn/README.eicon (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 2007-12-15 05:19:39.410666924 +0100 -+++ linux-2.4.35.4/Documentation/isdn/README.hysdn 2007-12-15 05:19:55.491583323 +0100 +--- linux-2.4.35.4.orig/Documentation/isdn/README.hysdn ++++ linux-2.4.35.4/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 $ @@ -230,8 +230,8 @@ Index: linux-2.4.35.4/Documentation/isdn/README.hysdn 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 2007-12-15 05:19:39.418667379 +0100 -+++ linux-2.4.35.4/Documentation/isdn/README.icn 2007-12-15 05:19:55.491583323 +0100 +--- linux-2.4.35.4.orig/Documentation/isdn/README.icn ++++ linux-2.4.35.4/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 $ @@ -240,9 +240,9 @@ Index: linux-2.4.35.4/Documentation/isdn/README.icn Index: linux-2.4.35.4/Documentation/isdn/README.pcbit =================================================================== ---- linux-2.4.35.4.orig/Documentation/isdn/README.pcbit 2007-12-15 05:19:39.422667608 +0100 -+++ linux-2.4.35.4/Documentation/isdn/README.pcbit 2007-12-15 05:19:55.491583323 +0100 -@@ -37,4 +37,4 @@ +--- linux-2.4.35.4.orig/Documentation/isdn/README.pcbit ++++ linux-2.4.35.4/Documentation/isdn/README.pcbit +@@ -37,4 +37,4 @@ mailing list (isdn4linux@listserv.isdn4l regards, Pedro. @@ -250,8 +250,8 @@ Index: linux-2.4.35.4/Documentation/isdn/README.pcbit +<roque@di.fc.ul.pt> Index: linux-2.4.35.4/Documentation/isdn/abcext_kernel.help =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/Documentation/isdn/abcext_kernel.help 2007-12-15 05:19:55.491583323 +0100 +--- /dev/null ++++ linux-2.4.35.4/Documentation/isdn/abcext_kernel.help @@ -0,0 +1,166 @@ + +ISDN-ABC-DW Extension @@ -421,8 +421,8 @@ Index: linux-2.4.35.4/Documentation/isdn/abcext_kernel.help + Index: linux-2.4.35.4/drivers/isdn/Config.in =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/Config.in 2007-12-15 05:19:39.438668519 +0100 -+++ linux-2.4.35.4/drivers/isdn/Config.in 2007-12-15 05:19:55.491583323 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/Config.in ++++ linux-2.4.35.4/drivers/isdn/Config.in @@ -4,11 +4,9 @@ # only included if CONFIG_ISDN != n @@ -435,7 +435,7 @@ Index: linux-2.4.35.4/drivers/isdn/Config.in bool ' Use VJ-compression with synchronous PPP' CONFIG_ISDN_PPP_VJ bool ' Support generic MP (RFC 1717)' CONFIG_ISDN_MPP dep_tristate ' Support BSD compression' CONFIG_ISDN_PPP_BSDCOMP $CONFIG_ISDN -@@ -23,6 +21,30 @@ +@@ -23,6 +21,30 @@ if [ "$CONFIG_X25" != "n" ]; then fi mainmenu_option next_comment @@ -466,7 +466,7 @@ Index: linux-2.4.35.4/drivers/isdn/Config.in comment 'ISDN feature submodules' dep_tristate 'isdnloop support' CONFIG_ISDN_DRV_LOOP $CONFIG_ISDN dep_tristate 'Support isdn diversion services' CONFIG_ISDN_DIVERSION $CONFIG_ISDN -@@ -34,7 +56,6 @@ +@@ -34,7 +56,6 @@ mainmenu_option next_comment comment 'Passive ISDN cards' dep_tristate 'HiSax SiemensChipSet driver support' CONFIG_ISDN_DRV_HISAX $CONFIG_ISDN if [ "$CONFIG_ISDN_DRV_HISAX" != "n" ]; then @@ -474,7 +474,7 @@ Index: linux-2.4.35.4/drivers/isdn/Config.in comment ' D-channel protocol features' bool ' HiSax Support for EURO/DSS1' CONFIG_HISAX_EURO if [ "$CONFIG_HISAX_EURO" != "n" ]; then -@@ -45,31 +66,28 @@ +@@ -45,31 +66,28 @@ if [ "$CONFIG_ISDN_DRV_HISAX" != "n" ]; fi bool ' HiSax Support for german 1TR6' CONFIG_HISAX_1TR6 bool ' HiSax Support for US NI1' CONFIG_HISAX_NI1 @@ -517,7 +517,7 @@ Index: linux-2.4.35.4/drivers/isdn/Config.in bool ' Telekom A4T card' CONFIG_HISAX_BKM_A4T bool ' Scitel Quadro card' CONFIG_HISAX_SCT_QUADRO bool ' Gazel cards' CONFIG_HISAX_GAZEL -@@ -78,20 +96,27 @@ +@@ -78,20 +96,27 @@ if [ "$CONFIG_ISDN_DRV_HISAX" != "n" ]; bool ' HFC-S+, HFC-SP, HFC-PCMCIA cards' CONFIG_HISAX_HFC_SX if [ "$CONFIG_EXPERIMENTAL" != "n" ]; then # bool ' TESTEMULATOR (EXPERIMENTAL)' CONFIG_HISAX_TESTEMU @@ -554,8 +554,8 @@ Index: linux-2.4.35.4/drivers/isdn/Config.in Index: linux-2.4.35.4/drivers/isdn/Makefile =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/Makefile 2007-12-15 05:19:39.446668974 +0100 -+++ linux-2.4.35.4/drivers/isdn/Makefile 2007-12-15 05:19:55.495583552 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/Makefile ++++ linux-2.4.35.4/drivers/isdn/Makefile @@ -2,7 +2,7 @@ # The target object and module list name. @@ -565,7 +565,7 @@ Index: linux-2.4.35.4/drivers/isdn/Makefile # Objects that export symbols. -@@ -32,9 +32,9 @@ +@@ -32,9 +32,9 @@ obj-$(CONFIG_ISDN_PPP_BSDCOMP) += isdn_ # Object files in subdirectories @@ -579,15 +579,15 @@ Index: linux-2.4.35.4/drivers/isdn/Makefile 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 2007-12-15 05:19:39.450669203 +0100 -+++ linux-2.4.35.4/drivers/isdn/act2000/act2000.h 2007-12-15 05:19:55.495583552 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/act2000/act2000.h ++++ linux-2.4.35.4/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$ * * ISDN lowlevel-module for the IBM ISDN-S0 Active 2000. * -@@ -178,19 +178,19 @@ +@@ -178,19 +178,19 @@ typedef struct act2000_card { char regname[35]; /* Name used for request_region */ } act2000_card; @@ -612,15 +612,15 @@ Index: linux-2.4.35.4/drivers/isdn/act2000/act2000.h 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 2007-12-15 05:19:39.458669659 +0100 -+++ linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.c 2007-12-15 05:19:55.495583552 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/act2000/act2000_isa.c ++++ linux-2.4.35.4/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$ * * ISDN lowlevel-module for the IBM ISDN-S0 Active 2000 (ISA-Version). * -@@ -178,8 +178,7 @@ +@@ -178,8 +178,7 @@ act2000_isa_config_port(act2000_card * c card->flags &= ~ACT2000_FLAGS_PVALID; } if (!check_region(portbase, ISA_REGION)) { @@ -630,7 +630,7 @@ Index: linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.c card->port = portbase; card->flags |= ACT2000_FLAGS_PVALID; return 0; -@@ -341,6 +340,9 @@ +@@ -341,6 +340,9 @@ act2000_isa_send(act2000_card * card) while (skb->len) { if (act2000_isa_writeb(card, *(skb->data))) { /* Fifo is full, but more data to send */ @@ -640,7 +640,7 @@ Index: linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.c test_and_clear_bit(ACT2000_LOCK_TX, (void *) &card->ilock); /* Schedule myself */ act2000_schedule_tx(card); -@@ -363,6 +365,9 @@ +@@ -363,6 +365,9 @@ act2000_isa_send(act2000_card * card) } else dev_kfree_skb(skb); card->sbuf = NULL; @@ -652,8 +652,8 @@ Index: linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.c Index: linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/act2000/act2000_isa.h 2007-12-15 05:19:39.466670114 +0100 -+++ linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.h 2007-12-15 05:19:55.495583552 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/act2000/act2000_isa.h ++++ linux-2.4.35.4/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$ @@ -662,15 +662,15 @@ Index: linux-2.4.35.4/drivers/isdn/act2000/act2000_isa.h * Index: linux-2.4.35.4/drivers/isdn/act2000/capi.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/act2000/capi.c 2007-12-15 05:19:39.474670572 +0100 -+++ linux-2.4.35.4/drivers/isdn/act2000/capi.c 2007-12-15 05:19:55.495583552 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/act2000/capi.c ++++ linux-2.4.35.4/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$ * * ISDN lowlevel-module for the IBM ISDN-S0 Active 2000. * CAPI encoder/decoder -@@ -76,6 +76,10 @@ +@@ -76,6 +76,10 @@ static actcapi_msgdsc valid_msg[] = { {{ 0x84, 0x03}, "DISCONNECT_B3_RESP"}, {{ 0x86, 0x03}, "DATA_B3_RESP"}, {{ 0xff, 0x03}, "MANUFACTURER_RESP"}, @@ -683,15 +683,15 @@ Index: linux-2.4.35.4/drivers/isdn/act2000/capi.c }; Index: linux-2.4.35.4/drivers/isdn/act2000/capi.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/act2000/capi.h 2007-12-15 05:19:39.478670799 +0100 -+++ linux-2.4.35.4/drivers/isdn/act2000/capi.h 2007-12-15 05:19:55.499583778 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/act2000/capi.h ++++ linux-2.4.35.4/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$ * * ISDN lowlevel-module for the IBM ISDN-S0 Active 2000. * -@@ -294,6 +294,19 @@ +@@ -294,6 +294,19 @@ typedef struct actcapi_msg { __u16 plci; __u16 info; } select_b3_protocol_conf; @@ -711,7 +711,7 @@ Index: linux-2.4.35.4/drivers/isdn/act2000/capi.h struct listen_req { __u8 controller; __u32 infomask __attribute__ ((packed)); -@@ -304,6 +317,7 @@ +@@ -304,6 +317,7 @@ typedef struct actcapi_msg { __u8 controller; __u16 info __attribute__ ((packed)); } listen_conf; @@ -719,7 +719,7 @@ Index: linux-2.4.35.4/drivers/isdn/act2000/capi.h struct data_b3_req { __u16 fakencci; __u16 datalen; -@@ -330,7 +344,7 @@ +@@ -330,7 +344,7 @@ typedef struct actcapi_msg { } msg; } actcapi_msg; @@ -730,15 +730,15 @@ Index: linux-2.4.35.4/drivers/isdn/act2000/capi.h 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 2007-12-15 05:19:39.486671254 +0100 -+++ linux-2.4.35.4/drivers/isdn/act2000/module.c 2007-12-15 05:19:55.499583778 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/act2000/module.c ++++ linux-2.4.35.4/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$ * * ISDN lowlevel-module for the IBM ISDN-S0 Active 2000. * -@@ -630,6 +630,10 @@ +@@ -630,6 +630,10 @@ act2000_alloccard(int bus, int port, int card->interface.features = ISDN_FEATURE_L2_X75I | ISDN_FEATURE_L2_HDLC | @@ -749,7 +749,7 @@ Index: linux-2.4.35.4/drivers/isdn/act2000/module.c ISDN_FEATURE_L3_TRANS | ISDN_FEATURE_P_UNKNOWN; card->interface.hl_hdrlen = 20; -@@ -843,6 +847,39 @@ +@@ -843,6 +847,39 @@ static void __exit act2000_exit(void) } printk(KERN_INFO "%s unloaded\n", DRIVERNAME); } @@ -791,8 +791,8 @@ Index: linux-2.4.35.4/drivers/isdn/act2000/module.c 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 2007-12-15 05:19:39.494671712 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/avm_cs.c 2007-12-15 05:19:55.499583778 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/avm_cs.c ++++ linux-2.4.35.4/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 $ @@ -801,8 +801,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/avm_cs.c * Index: linux-2.4.35.4/drivers/isdn/avmb1/avmcard.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/avmcard.h 2007-12-15 05:19:39.502672167 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/avmcard.h 2007-12-15 05:19:55.499583778 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/avmcard.h ++++ linux-2.4.35.4/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 $ @@ -811,8 +811,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/avmcard.h * Index: linux-2.4.35.4/drivers/isdn/avmb1/b1.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1.c 2007-12-15 05:19:39.510672623 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/b1.c 2007-12-15 05:19:55.503584007 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1.c ++++ linux-2.4.35.4/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 $ @@ -838,8 +838,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/b1.c Index: linux-2.4.35.4/drivers/isdn/avmb1/b1dma.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1dma.c 2007-12-15 05:19:39.514672852 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/b1dma.c 2007-12-15 05:19:55.503584007 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1dma.c ++++ linux-2.4.35.4/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 $ @@ -867,7 +867,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/b1dma.c /* ------------------------------------------------------------- */ -@@ -851,7 +856,7 @@ +@@ -851,7 +856,7 @@ int b1dmactl_read_proc(char *page, char __u8 flag; int len = 0; char *s; @@ -876,7 +876,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/b1dma.c len += sprintf(page+len, "%-16s %s\n", "name", card->name); len += sprintf(page+len, "%-16s 0x%x\n", "io", card->port); -@@ -907,12 +912,12 @@ +@@ -907,12 +912,12 @@ int b1dmactl_read_proc(char *page, char save_flags(flags); cli(); @@ -895,8 +895,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/b1dma.c 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 2007-12-15 05:19:39.522673307 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/b1isa.c 2007-12-15 05:19:55.503584007 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1isa.c ++++ linux-2.4.35.4/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 $ @@ -920,8 +920,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/b1isa.c Index: linux-2.4.35.4/drivers/isdn/avmb1/b1pci.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1pci.c 2007-12-15 05:19:39.530673763 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/b1pci.c 2007-12-15 05:19:55.503584007 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1pci.c ++++ linux-2.4.35.4/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 $ @@ -954,7 +954,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/b1pci.c MODULE_DESCRIPTION("CAPI4Linux: Driver for AVM B1 PCI card"); MODULE_AUTHOR("Carsten Paeth"); MODULE_LICENSE("GPL"); -@@ -416,14 +419,14 @@ +@@ -416,14 +419,14 @@ static int add_card(struct pci_dev *dev) } param.irq = dev->irq; @@ -972,7 +972,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/b1pci.c printk(KERN_INFO "%s: PCI BIOS reports AVM-B1 V4 at i/o %#x, irq %d, mem %#x\n", -@@ -440,7 +443,7 @@ +@@ -440,7 +443,7 @@ static int add_card(struct pci_dev *dev) } } else { param.membase = 0; @@ -983,8 +983,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/b1pci.c "%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 2007-12-15 05:19:39.538674218 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/b1pcmcia.c 2007-12-15 05:19:55.503584007 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/b1pcmcia.c ++++ linux-2.4.35.4/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 $ @@ -1002,8 +1002,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/b1pcmcia.c Index: linux-2.4.35.4/drivers/isdn/avmb1/c4.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/c4.c 2007-12-15 05:19:39.542674447 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/c4.c 2007-12-15 05:19:55.507584236 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/c4.c ++++ linux-2.4.35.4/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 $ @@ -1027,7 +1027,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/c4.c #undef CONFIG_C4_DEBUG #undef CONFIG_C4_POLLDEBUG -@@ -39,6 +40,7 @@ +@@ -39,6 +40,7 @@ static char *revision = "$Revision: 1.1. static int suppress_pollack; @@ -1035,7 +1035,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/c4.c static struct pci_device_id c4_pci_tbl[] __initdata = { { PCI_VENDOR_ID_DEC,PCI_DEVICE_ID_DEC_21285, PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_C4 }, { PCI_VENDOR_ID_DEC,PCI_DEVICE_ID_DEC_21285, PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_C2 }, -@@ -46,6 +48,7 @@ +@@ -46,6 +48,7 @@ static struct pci_device_id c4_pci_tbl[] }; MODULE_DEVICE_TABLE(pci, c4_pci_tbl); @@ -1043,7 +1043,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/c4.c MODULE_DESCRIPTION("CAPI4Linux: Driver for AVM C2/C4 cards"); MODULE_AUTHOR("Carsten Paeth"); MODULE_LICENSE("GPL"); -@@ -1332,9 +1335,9 @@ +@@ -1332,9 +1335,9 @@ static int __init search_cards(struct ca } pci_set_master(dev); @@ -1057,8 +1057,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/c4.c "%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 2007-12-15 05:19:39.550674902 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/capi.c 2007-12-15 05:19:55.507584236 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capi.c ++++ linux-2.4.35.4/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 $ @@ -1101,7 +1101,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c MODULE_DESCRIPTION("CAPI4Linux: Userspace /dev/capi20 interface"); MODULE_AUTHOR("Carsten Paeth"); -@@ -87,10 +93,10 @@ +@@ -87,10 +93,10 @@ struct capiminor { struct capincci *nccip; unsigned int minor; @@ -1116,7 +1116,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c struct file *file; struct tty_struct *tty; -@@ -112,16 +118,22 @@ +@@ -112,16 +118,22 @@ struct capiminor { /* transmit path */ struct datahandle_queue { struct datahandle_queue *next; @@ -1141,7 +1141,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c struct capidev *cdev; #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE struct capiminor *minorp; -@@ -131,8 +143,8 @@ +@@ -131,8 +143,8 @@ struct capincci { struct capidev { struct capidev *next; struct file *file; @@ -1152,7 +1152,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c unsigned int minor; unsigned userflags; -@@ -156,22 +168,28 @@ +@@ -156,22 +168,28 @@ static struct capidev *capidev_openlist static struct capiminor *minors = 0; #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ @@ -1182,7 +1182,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c if (!n) { printk(KERN_ERR "capi: alloc datahandle failed\n"); return -1; -@@ -184,7 +202,7 @@ +@@ -184,7 +202,7 @@ static int capincci_add_ack(struct capim return 0; } @@ -1191,7 +1191,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct datahandle_queue **pp, *p; -@@ -192,7 +210,11 @@ +@@ -192,7 +210,11 @@ static int capiminor_del_ack(struct capi if ((*pp)->datahandle == datahandle) { p = *pp; *pp = (*pp)->next; @@ -1203,7 +1203,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c mp->nack--; return 0; } -@@ -200,7 +222,7 @@ +@@ -200,7 +222,7 @@ static int capiminor_del_ack(struct capi return -1; } @@ -1212,7 +1212,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct datahandle_queue **pp, *p; -@@ -208,7 +230,11 @@ +@@ -208,7 +230,11 @@ static void capiminor_del_all_ack(struct while (*pp) { p = *pp; *pp = (*pp)->next; @@ -1224,7 +1224,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c mp->nack--; } } -@@ -216,13 +242,17 @@ +@@ -216,13 +242,17 @@ static void capiminor_del_all_ack(struct /* -------- struct capiminor ---------------------------------------- */ @@ -1243,7 +1243,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c if (!mp) { MOD_DEC_USE_COUNT; printk(KERN_ERR "capi: can't alloc capiminor\n"); -@@ -257,7 +287,7 @@ +@@ -257,7 +287,7 @@ static struct capiminor *capiminor_alloc return mp; } @@ -1252,7 +1252,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct capiminor **pp; -@@ -271,7 +301,11 @@ +@@ -271,7 +301,11 @@ static void capiminor_free(struct capimi skb_queue_purge(&mp->inqueue); skb_queue_purge(&mp->outqueue); capiminor_del_all_ack(mp); @@ -1264,7 +1264,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c MOD_DEC_USE_COUNT; #ifdef _DEBUG_REFCOUNT printk(KERN_DEBUG "capiminor_free %d\n", GET_USE_COUNT(THIS_MODULE)); -@@ -283,7 +317,7 @@ +@@ -283,7 +317,7 @@ static void capiminor_free(struct capimi } } @@ -1273,7 +1273,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct capiminor *p; for (p = minors; p && p->minor != minor; p = p->next) -@@ -294,7 +328,7 @@ +@@ -294,7 +328,7 @@ static struct capiminor *capiminor_find( /* -------- struct capincci ----------------------------------------- */ @@ -1282,7 +1282,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct capincci *np, **pp; #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE -@@ -302,7 +336,11 @@ +@@ -302,7 +336,11 @@ static struct capincci *capincci_alloc(s kdev_t kdev; #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ @@ -1294,7 +1294,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c if (!np) return 0; memset(np, 0, sizeof(struct capincci)); -@@ -331,7 +369,7 @@ +@@ -331,7 +369,7 @@ static struct capincci *capincci_alloc(s return np; } @@ -1303,7 +1303,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct capincci *np, **pp; #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE -@@ -367,7 +405,11 @@ +@@ -367,7 +405,11 @@ static void capincci_free(struct capidev } } #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ @@ -1315,7 +1315,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c if (*pp == 0) return; } else { pp = &(*pp)->next; -@@ -375,7 +417,7 @@ +@@ -375,7 +417,7 @@ static void capincci_free(struct capidev } } @@ -1324,7 +1324,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct capincci *p; -@@ -393,7 +435,11 @@ +@@ -393,7 +435,11 @@ static struct capidev *capidev_alloc(str struct capidev *cdev; struct capidev **pp; @@ -1336,7 +1336,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c if (!cdev) return 0; memset(cdev, 0, sizeof(struct capidev)); -@@ -423,10 +469,14 @@ +@@ -423,10 +469,14 @@ static void capidev_free(struct capidev if (*pp) *pp = cdev->next; @@ -1352,7 +1352,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct capidev *p; for (p=capidev_openlist; p; p = p->next) { -@@ -439,13 +489,13 @@ +@@ -439,13 +489,13 @@ static struct capidev *capidev_find(u16 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE /* -------- handle data queue --------------------------------------- */ @@ -1368,7 +1368,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c unsigned char *s = skb_put(nskb, CAPI_DATA_B3_RESP_LEN); capimsg_setu16(s, 0, CAPI_DATA_B3_RESP_LEN); capimsg_setu16(s, 2, mp->applid); -@@ -458,11 +508,11 @@ +@@ -458,11 +508,11 @@ gen_data_b3_resp_for(struct capiminor *m return nskb; } @@ -1382,7 +1382,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c datalen = skb->len - CAPIMSG_LEN(skb->data); if (mp->tty) { -@@ -504,6 +554,28 @@ +@@ -504,6 +554,28 @@ static int handle_recv_skb(struct capimi kfree_skb(skb); return 0; @@ -1411,7 +1411,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c } else if (mp->file) { if (skb_queue_len(&mp->recvqueue) > CAPINC_MAX_RECVQUEUE) { #if defined(_DEBUG_DATAFLOW) || defined(_DEBUG_TTYFUNCS) -@@ -538,7 +610,7 @@ +@@ -538,7 +610,7 @@ static int handle_recv_skb(struct capimi return -1; } @@ -1420,7 +1420,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct sk_buff *skb; while ((skb = skb_dequeue(&mp->inqueue)) != 0) { -@@ -552,13 +624,13 @@ +@@ -552,13 +624,13 @@ static void handle_minor_recv(struct cap } } @@ -1438,7 +1438,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c if (mp->tty && mp->ttyoutstop) { #if defined(_DEBUG_DATAFLOW) || defined(_DEBUG_TTYFUNCS) -@@ -569,7 +641,7 @@ +@@ -569,7 +641,7 @@ static int handle_minor_send(struct capi while ((skb = skb_dequeue(&mp->outqueue)) != 0) { datahandle = mp->datahandle; @@ -1447,7 +1447,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c skb_push(skb, CAPI_DATA_B3_REQ_LEN); memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN); capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN); -@@ -578,7 +650,7 @@ +@@ -578,7 +650,7 @@ static int handle_minor_send(struct capi capimsg_setu8 (skb->data, 5, CAPI_REQ); capimsg_setu16(skb->data, 6, mp->msgid++); capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */ @@ -1456,7 +1456,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c capimsg_setu16(skb->data, 16, len); /* Data length */ capimsg_setu16(skb->data, 18, datahandle); capimsg_setu16(skb->data, 20, 0); /* Flags */ -@@ -620,16 +692,16 @@ +@@ -620,16 +692,16 @@ static int handle_minor_send(struct capi #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ /* -------- function called by lower level -------------------------- */ @@ -1476,7 +1476,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c (void) (*capifuncs->capi_get_message) (applid, &skb); if (!skb) { -@@ -683,6 +755,12 @@ +@@ -683,6 +755,12 @@ static void capi_signal(u16 applid, void #endif kfree_skb(skb); (void)capiminor_del_ack(mp, datahandle); @@ -1489,7 +1489,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c if (mp->tty) { if (mp->tty->ldisc.write_wakeup) mp->tty->ldisc.write_wakeup(mp->tty); -@@ -758,7 +836,7 @@ +@@ -758,7 +836,7 @@ capi_write(struct file *file, const char struct capidev *cdev = (struct capidev *)file->private_data; struct sk_buff *skb; int retval; @@ -1498,7 +1498,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c if (ppos != &file->f_pos) return -ESPIPE; -@@ -998,7 +1076,7 @@ +@@ -998,7 +1076,7 @@ capi_ioctl(struct inode *inode, struct f sizeof(ncci)); if (retval) return -EFAULT; @@ -1507,7 +1507,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c if (!nccip) return 0; #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE -@@ -1023,7 +1101,7 @@ +@@ -1023,7 +1101,7 @@ capi_ioctl(struct inode *inode, struct f sizeof(ncci)); if (retval) return -EFAULT; @@ -1516,7 +1516,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c if (!nccip || (mp = nccip->minorp) == 0) return -ESRCH; return mp->minor; -@@ -1070,7 +1148,9 @@ +@@ -1070,7 +1148,9 @@ capi_release(struct inode *inode, struct static struct file_operations capi_fops = { @@ -1526,7 +1526,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c llseek: no_llseek, read: capi_read, write: capi_write, -@@ -1233,6 +1313,45 @@ +@@ -1233,6 +1313,45 @@ capinc_raw_ioctl(struct inode *inode, st return -EINVAL; switch (cmd) { @@ -1572,7 +1572,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c } return -EINVAL; } -@@ -1260,7 +1379,9 @@ +@@ -1260,7 +1379,9 @@ capinc_raw_release(struct inode *inode, static struct file_operations capinc_raw_fops = { @@ -1582,7 +1582,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c llseek: no_llseek, read: capinc_raw_read, write: capinc_raw_write, -@@ -1272,7 +1393,7 @@ +@@ -1272,7 +1393,7 @@ static struct file_operations capinc_raw /* -------- tty_operations for capincci ----------------------------- */ @@ -1591,7 +1591,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct capiminor *mp; -@@ -1300,7 +1421,7 @@ +@@ -1300,7 +1421,7 @@ static int capinc_tty_open(struct tty_st return 0; } @@ -1600,7 +1600,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct capiminor *mp; -@@ -1325,8 +1446,8 @@ +@@ -1325,8 +1446,8 @@ static void capinc_tty_close(struct tty_ #endif } @@ -1611,7 +1611,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct capiminor *mp = (struct capiminor *)tty->driver_data; struct sk_buff *skb; -@@ -1377,7 +1498,7 @@ +@@ -1377,7 +1498,7 @@ static int capinc_tty_write(struct tty_s return count; } @@ -1620,7 +1620,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct capiminor *mp = (struct capiminor *)tty->driver_data; struct sk_buff *skb; -@@ -1414,7 +1535,7 @@ +@@ -1414,7 +1535,7 @@ static void capinc_tty_put_char(struct t } } @@ -1629,7 +1629,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct capiminor *mp = (struct capiminor *)tty->driver_data; struct sk_buff *skb; -@@ -1440,7 +1561,7 @@ +@@ -1440,7 +1561,7 @@ static void capinc_tty_flush_chars(struc (void)handle_minor_recv(mp); } @@ -1638,7 +1638,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct capiminor *mp = (struct capiminor *)tty->driver_data; int room; -@@ -1458,7 +1579,7 @@ +@@ -1458,7 +1579,7 @@ static int capinc_tty_write_room(struct return room; } @@ -1647,7 +1647,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct capiminor *mp = (struct capiminor *)tty->driver_data; if (!mp || !mp->nccip) { -@@ -1476,7 +1597,7 @@ +@@ -1476,7 +1597,7 @@ static int capinc_tty_chars_in_buffer(st return mp->outbytes; } @@ -1656,7 +1656,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c unsigned int cmd, unsigned long arg) { int error = 0; -@@ -1488,14 +1609,14 @@ +@@ -1488,14 +1609,14 @@ static int capinc_tty_ioctl(struct tty_s return error; } @@ -1673,7 +1673,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct capiminor *mp = (struct capiminor *)tty->driver_data; #ifdef _DEBUG_TTYFUNCS -@@ -1505,7 +1626,7 @@ +@@ -1505,7 +1626,7 @@ static void capinc_tty_throttle(struct t mp->ttyinstop = 1; } @@ -1682,7 +1682,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct capiminor *mp = (struct capiminor *)tty->driver_data; #ifdef _DEBUG_TTYFUNCS -@@ -1517,7 +1638,7 @@ +@@ -1517,7 +1638,7 @@ static void capinc_tty_unthrottle(struct } } @@ -1691,7 +1691,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct capiminor *mp = (struct capiminor *)tty->driver_data; #ifdef _DEBUG_TTYFUNCS -@@ -1528,7 +1649,7 @@ +@@ -1528,7 +1649,7 @@ static void capinc_tty_stop(struct tty_s } } @@ -1700,7 +1700,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct capiminor *mp = (struct capiminor *)tty->driver_data; #ifdef _DEBUG_TTYFUNCS -@@ -1540,43 +1661,49 @@ +@@ -1540,43 +1661,49 @@ static void capinc_tty_start(struct tty_ } } @@ -1757,7 +1757,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { return 0; } -@@ -1588,7 +1715,7 @@ +@@ -1588,7 +1715,7 @@ static struct tty_struct *capinc_tty_tab static struct termios *capinc_tty_termios[CAPINC_NR_PORTS]; static struct termios *capinc_tty_termios_locked[CAPINC_NR_PORTS]; @@ -1766,7 +1766,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct tty_driver *drv = &capinc_tty_driver; -@@ -1646,7 +1773,7 @@ +@@ -1646,7 +1773,7 @@ static int capinc_tty_init(void) return 0; } @@ -1775,7 +1775,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct tty_driver *drv = &capinc_tty_driver; int retval; -@@ -1771,8 +1898,9 @@ +@@ -1771,8 +1898,9 @@ static void __exit proc_exit(void) /* -------- init function and module interface ---------------------- */ @@ -1786,7 +1786,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { if (capidev_cachep) { (void)kmem_cache_destroy(capidev_cachep); -@@ -1837,8 +1965,9 @@ +@@ -1837,8 +1965,9 @@ static int __init alloc_init(void) #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ return 0; } @@ -1797,7 +1797,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c { struct capi_ncciinfo *np; struct capidev *cdev; -@@ -1900,15 +2029,19 @@ +@@ -1900,15 +2029,19 @@ static int __init capi_init(void) MOD_DEC_USE_COUNT; return -EIO; } @@ -1817,7 +1817,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c printk(KERN_NOTICE "capi20: started up with major %d\n", capi_major); if ((capifuncs = attach_capi_interface(&cuser)) == 0) { -@@ -1918,9 +2051,11 @@ +@@ -1918,9 +2051,11 @@ static int __init capi_init(void) #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE devfs_unregister_chrdev(capi_rawmajor, "capi/r%d"); #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ @@ -1829,7 +1829,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c return -EIO; } -@@ -1934,8 +2069,10 @@ +@@ -1934,8 +2069,10 @@ static int __init capi_init(void) } #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */ @@ -1840,7 +1840,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c unsigned int j; devfs_unregister_chrdev(capi_rawmajor, "capi/r%d"); for (j = 0; j < CAPINC_NR_PORTS; j++) { -@@ -1943,16 +2080,20 @@ +@@ -1943,16 +2080,20 @@ static int __init capi_init(void) sprintf(devname, "capi/r%u", j); devfs_unregister(devfs_find_handle(NULL, devname, capi_rawmajor, j, DEVFS_SPECIAL_CHR, 0)); } @@ -1861,7 +1861,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c (void)proc_init(); -@@ -1975,23 +2116,31 @@ +@@ -1975,23 +2116,31 @@ static int __init capi_init(void) static void __exit capi_exit(void) { #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE @@ -1895,8 +1895,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capi.c } Index: linux-2.4.35.4/drivers/isdn/avmb1/capicmd.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capicmd.h 2007-12-15 05:19:39.558675358 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/capicmd.h 2007-12-15 05:19:55.507584236 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capicmd.h ++++ linux-2.4.35.4/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 $ @@ -1905,8 +1905,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capicmd.h * Index: linux-2.4.35.4/drivers/isdn/avmb1/capidev.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capidev.h 2007-12-15 05:19:39.566675816 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/capidev.h 2007-12-15 05:19:55.511584462 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capidev.h ++++ linux-2.4.35.4/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 $ @@ -1915,8 +1915,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capidev.h * Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capidrv.c 2007-12-15 05:19:39.570676042 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/capidrv.c 2007-12-15 05:19:55.511584462 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capidrv.c ++++ linux-2.4.35.4/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 $ @@ -1932,7 +1932,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.c static int debugmode = 0; MODULE_DESCRIPTION("CAPI4Linux: Interface to ISDN4Linux"); -@@ -105,7 +105,6 @@ +@@ -105,7 +105,6 @@ struct capidrv_contr { int oldstate; /* */ __u16 datahandle; @@ -1940,7 +1940,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.c struct ncci_datahandle_queue { struct ncci_datahandle_queue *next; __u16 datahandle; -@@ -423,7 +422,6 @@ +@@ -423,7 +422,6 @@ static inline capidrv_ncci *new_ncci(cap nccip->plcip = plcip; nccip->chan = plcip->chan; nccip->datahandle = 0; @@ -1948,7 +1948,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.c nccip->next = plcip->ncci_list; plcip->ncci_list = nccip; -@@ -480,7 +478,6 @@ +@@ -480,7 +478,6 @@ static int capidrv_add_ack(struct capidr __u16 datahandle, int len) { struct ncci_datahandle_queue *n, **pp; @@ -1956,7 +1956,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.c n = (struct ncci_datahandle_queue *) kmalloc(sizeof(struct ncci_datahandle_queue), GFP_ATOMIC); -@@ -491,31 +488,25 @@ +@@ -491,31 +488,25 @@ static int capidrv_add_ack(struct capidr n->next = 0; n->datahandle = datahandle; n->len = len; @@ -1988,7 +1988,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.c return -1; } -@@ -523,25 +514,13 @@ +@@ -523,25 +514,13 @@ static int capidrv_del_ack(struct capidr static void send_message(capidrv_contr * card, _cmsg * cmsg) { @@ -2017,7 +2017,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.c global.nsentctlpkt++; } -@@ -1932,8 +1911,10 @@ +@@ -1932,8 +1911,10 @@ static int if_sendbuf(int id, int channe (void)capidrv_del_ack(nccip, datahandle); return 0; } @@ -2028,7 +2028,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.c memcpy(skb_push(nskb, msglen), sendcmsg.buf, msglen); errcode = (*capifuncs->capi_put_message) (global.appid, nskb); if (errcode == CAPI_NOERROR) { -@@ -2035,6 +2016,52 @@ +@@ -2035,6 +2016,52 @@ static void enable_dchannel_trace(capidr send_message(card, &cmdcmsg); } @@ -2081,7 +2081,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.c static void send_listen(capidrv_contr *card) { -@@ -2200,10 +2227,10 @@ +@@ -2200,10 +2227,10 @@ static int capidrv_delcontr(__u16 contr) free_ncci(card, card->bchans[card->nbchan-1].nccip); if (card->bchans[card->nbchan-1].plcip) free_plci(card, card->bchans[card->nbchan-1].plcip); @@ -2096,8 +2096,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.c Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capidrv.h 2007-12-15 05:19:39.578676498 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/capidrv.h 2007-12-15 05:19:55.511584462 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capidrv.h ++++ linux-2.4.35.4/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 $ @@ -2106,8 +2106,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capidrv.h * Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capifs.c 2007-12-15 05:19:39.586676956 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/capifs.c 2007-12-15 05:19:55.511584462 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capifs.c ++++ linux-2.4.35.4/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 $ @@ -2122,7 +2122,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c #include <asm/bitops.h> #include <asm/uaccess.h> -@@ -32,7 +33,7 @@ +@@ -32,7 +33,7 @@ MODULE_DESCRIPTION("CAPI4Linux: /dev/cap MODULE_AUTHOR("Carsten Paeth"); MODULE_LICENSE("GPL"); @@ -2131,7 +2131,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c struct capifs_ncci { struct inode *inode; -@@ -69,14 +70,21 @@ +@@ -69,14 +70,21 @@ static inline struct capifs_sb_info *SBI static int capifs_root_readdir(struct file *,void *,filldir_t); static struct dentry *capifs_root_lookup(struct inode *,struct dentry *); static int capifs_revalidate(struct dentry *, int); @@ -2153,7 +2153,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c lookup: capifs_root_lookup, }; -@@ -101,12 +109,20 @@ +@@ -101,12 +109,20 @@ static int capifs_root_readdir(struct fi switch(nr) { case 0: @@ -2174,7 +2174,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c return 0; filp->f_pos = ++nr; /* fall through */ -@@ -118,7 +134,11 @@ +@@ -118,7 +134,11 @@ static int capifs_root_readdir(struct fi char *p = numbuf; if (np->type) *p++ = np->type; sprintf(p, "%u", np->num); @@ -2186,7 +2186,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c return 0; } filp->f_pos = ++nr; -@@ -180,7 +200,7 @@ +@@ -180,7 +200,7 @@ static struct dentry *capifs_root_lookup dentry->d_inode = np->inode; if ( dentry->d_inode ) @@ -2195,7 +2195,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c d_add(dentry, dentry->d_inode); -@@ -199,9 +219,9 @@ +@@ -199,9 +219,9 @@ static void capifs_put_super(struct supe for ( i = 0 ; i < sbi->max_ncci ; i++ ) { if ( (inode = sbi->nccis[i].inode) ) { @@ -2207,7 +2207,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c inode->i_nlink--; iput(inode); } -@@ -213,11 +233,24 @@ +@@ -213,11 +233,24 @@ static void capifs_put_super(struct supe kfree(sbi->nccis); kfree(sbi); @@ -2232,7 +2232,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c put_super: capifs_put_super, statfs: capifs_statfs, }; -@@ -288,6 +321,10 @@ +@@ -288,6 +321,10 @@ struct super_block *capifs_read_super(st struct dentry * root; struct capifs_sb_info *sbi; @@ -2243,7 +2243,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c /* Super block already completed? */ if (s->s_root) goto out; -@@ -322,6 +359,7 @@ +@@ -322,6 +359,7 @@ struct super_block *capifs_read_super(st /* * Get the root inode and dentry, but defer checking for errors. */ @@ -2251,7 +2251,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c root_inode = capifs_new_inode(s); if (root_inode) { root_inode->i_ino = 1; -@@ -331,6 +369,10 @@ +@@ -331,6 +369,10 @@ struct super_block *capifs_read_super(st root_inode->i_nlink = 2; } root = d_alloc_root(root_inode); @@ -2262,7 +2262,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c /* * Check whether somebody else completed the super block. -@@ -370,11 +412,34 @@ +@@ -370,11 +412,34 @@ struct super_block *capifs_read_super(st mounts = s; out: /* Success ... somebody else completed the super block for us. */ @@ -2297,7 +2297,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c static int capifs_statfs(struct super_block *sb, struct statfs *buf) { buf->f_type = CAPIFS_SUPER_MAGIC; -@@ -387,7 +452,9 @@ +@@ -387,7 +452,9 @@ static int capifs_statfs(struct super_bl buf->f_namelen = NAME_MAX; return 0; } @@ -2307,7 +2307,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c static struct inode *capifs_new_inode(struct super_block *sb) { struct inode *inode = new_inode(sb); -@@ -399,8 +466,51 @@ +@@ -399,8 +466,51 @@ static struct inode *capifs_new_inode(st } return inode; } @@ -2359,7 +2359,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c void capifs_new_ncci(char type, unsigned int num, kdev_t device) { -@@ -421,16 +531,26 @@ +@@ -421,16 +531,26 @@ void capifs_new_ncci(char type, unsigned break; } } @@ -2388,8 +2388,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.c } Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capifs.h 2007-12-15 05:19:39.594677411 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/capifs.h 2007-12-15 05:19:55.515584692 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capifs.h ++++ linux-2.4.35.4/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 $ @@ -2398,8 +2398,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capifs.h * Index: linux-2.4.35.4/drivers/isdn/avmb1/capilli.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capilli.h 2007-12-15 05:19:39.598677637 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/capilli.h 2007-12-15 05:19:55.515584692 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capilli.h ++++ linux-2.4.35.4/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 $ @@ -2408,8 +2408,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capilli.h * Index: linux-2.4.35.4/drivers/isdn/avmb1/capiutil.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/capiutil.c 2007-12-15 05:19:39.606678095 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/capiutil.c 2007-12-15 05:19:55.515584692 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capiutil.c ++++ linux-2.4.35.4/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 $ @@ -2426,8 +2426,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capiutil.c 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 2007-12-15 05:19:39.614678551 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/capiutil.h 2007-12-15 05:19:55.515584692 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/capiutil.h ++++ linux-2.4.35.4/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 $ @@ -2436,8 +2436,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/capiutil.h * Index: linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/kcapi.c 2007-12-15 05:19:39.622679006 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c 2007-12-15 05:19:55.519584918 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/kcapi.c ++++ linux-2.4.35.4/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 $ @@ -2461,7 +2461,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c /* ------------------------------------------------------------- */ -@@ -64,7 +65,6 @@ +@@ -64,7 +65,6 @@ struct capi_ncci { __u32 ncci; __u32 winsize; int nmsg; @@ -2469,7 +2469,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c struct msgidqueue *msgidqueue; struct msgidqueue *msgidlast; struct msgidqueue *msgidfree; -@@ -104,14 +104,14 @@ +@@ -104,14 +104,14 @@ static char capi_manufakturer[64] = "AVM #define APPL(a) (&applications[(a)-1]) #define VALID_APPLID(a) ((a) && (a) <= CAPI_MAXAPPL && APPL(a)->applid == a) #define APPL_IS_FREE(a) (APPL(a)->applid == 0) @@ -2487,7 +2487,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c static struct capi_appl applications[CAPI_MAXAPPL]; static struct capi_ctr cards[CAPI_MAXCONTR]; -@@ -535,9 +535,13 @@ +@@ -535,9 +535,13 @@ static int notify_push(unsigned int cmd, * of devices. Devices can only removed in * user process, not in bh. */ @@ -2501,7 +2501,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c return 0; } -@@ -546,13 +550,7 @@ +@@ -546,13 +550,7 @@ static int notify_push(unsigned int cmd, static void notify_up(__u32 contr) { struct capi_interface_user *p; @@ -2515,7 +2515,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c printk(KERN_NOTICE "kcapi: notify up contr %d\n", contr); spin_lock(&capi_users_lock); for (p = capi_users; p; p = p->next) { -@@ -639,7 +637,9 @@ +@@ -639,7 +637,9 @@ static void notify_handler(void *dummy) kfree(np); MOD_DEC_USE_COUNT; } @@ -2525,7 +2525,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c } /* -------- NCCI Handling ------------------------------------- */ -@@ -647,7 +647,6 @@ +@@ -647,7 +647,6 @@ static void notify_handler(void *dummy) static inline void mq_init(struct capi_ncci * np) { int i; @@ -2533,7 +2533,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c np->msgidqueue = 0; np->msgidlast = 0; np->nmsg = 0; -@@ -662,11 +661,8 @@ +@@ -662,11 +661,8 @@ static inline void mq_init(struct capi_n static inline int mq_enqueue(struct capi_ncci * np, __u16 msgid) { struct msgidqueue *mq; @@ -2546,7 +2546,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c np->msgidfree = mq->next; mq->msgid = msgid; mq->next = 0; -@@ -676,14 +672,12 @@ +@@ -676,14 +672,12 @@ static inline int mq_enqueue(struct capi if (!np->msgidqueue) np->msgidqueue = mq; np->nmsg++; @@ -2561,7 +2561,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c for (pp = &np->msgidqueue; *pp; pp = &(*pp)->next) { if ((*pp)->msgid == msgid) { struct msgidqueue *mq = *pp; -@@ -693,11 +687,9 @@ +@@ -693,11 +687,9 @@ static inline int mq_dequeue(struct capi mq->next = np->msgidfree; np->msgidfree = mq; np->nmsg--; @@ -2573,7 +2573,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c return 0; } -@@ -720,16 +712,12 @@ +@@ -720,16 +712,12 @@ static void controllercb_appl_released(s nextpp = &(*pp)->next; } } @@ -2596,7 +2596,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c } /* * ncci management -@@ -882,7 +870,16 @@ +@@ -882,7 +870,16 @@ error: static void controllercb_ready(struct capi_ctr * card) { @@ -2615,8 +2615,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/kcapi.c Index: linux-2.4.35.4/drivers/isdn/avmb1/t1isa.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/t1isa.c 2007-12-15 05:19:39.626679235 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/t1isa.c 2007-12-15 05:19:55.519584918 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/t1isa.c ++++ linux-2.4.35.4/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 $ @@ -2641,8 +2641,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/t1isa.c Index: linux-2.4.35.4/drivers/isdn/avmb1/t1pci.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/avmb1/t1pci.c 2007-12-15 05:19:39.634679691 +0100 -+++ linux-2.4.35.4/drivers/isdn/avmb1/t1pci.c 2007-12-15 05:19:55.519584918 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/avmb1/t1pci.c ++++ linux-2.4.35.4/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 $ @@ -2680,7 +2680,7 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/t1pci.c MODULE_DESCRIPTION("CAPI4Linux: Driver for AVM T1 PCI card"); MODULE_AUTHOR("Carsten Paeth"); MODULE_LICENSE("GPL"); -@@ -264,9 +267,9 @@ +@@ -264,9 +267,9 @@ static int __init t1pci_init(void) } pci_set_master(dev); @@ -2694,8 +2694,8 @@ Index: linux-2.4.35.4/drivers/isdn/avmb1/t1pci.c "%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 2007-12-15 05:19:39.642680146 +0100 -+++ linux-2.4.35.4/drivers/isdn/divert/divert_procfs.c 2007-12-15 05:19:55.519584918 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/divert/divert_procfs.c ++++ linux-2.4.35.4/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$ @@ -2719,7 +2719,7 @@ Index: linux-2.4.35.4/drivers/isdn/divert/divert_procfs.c #include "isdn_divert.h" /*********************************/ -@@ -80,7 +83,6 @@ +@@ -80,7 +83,6 @@ static ssize_t isdn_divert_read(struct file *file, char *buf, size_t count, loff_t * off) { struct divert_info *inf; @@ -2727,7 +2727,7 @@ Index: linux-2.4.35.4/drivers/isdn/divert/divert_procfs.c int len; if (!*((struct divert_info **) file->private_data)) { -@@ -92,11 +94,11 @@ +@@ -92,11 +94,11 @@ isdn_divert_read(struct file *file, char return (0); inf->usage_cnt--; /* new usage count */ @@ -2741,7 +2741,7 @@ Index: linux-2.4.35.4/drivers/isdn/divert/divert_procfs.c return (len); } return (0); -@@ -136,17 +138,23 @@ +@@ -136,17 +138,23 @@ isdn_divert_open(struct inode *ino, stru { unsigned long flags; @@ -2767,7 +2767,7 @@ Index: linux-2.4.35.4/drivers/isdn/divert/divert_procfs.c return (0); } /* isdn_divert_open */ -@@ -159,7 +167,9 @@ +@@ -159,7 +167,9 @@ isdn_divert_close(struct inode *ino, str struct divert_info *inf; unsigned long flags; @@ -2777,7 +2777,7 @@ Index: linux-2.4.35.4/drivers/isdn/divert/divert_procfs.c save_flags(flags); cli(); if_used--; -@@ -175,7 +185,11 @@ +@@ -175,7 +185,11 @@ isdn_divert_close(struct inode *ino, str divert_info_head = divert_info_head->next; kfree(inf); } @@ -2789,7 +2789,7 @@ Index: linux-2.4.35.4/drivers/isdn/divert/divert_procfs.c return (0); } /* isdn_divert_close */ -@@ -276,6 +290,9 @@ +@@ -276,6 +290,9 @@ static struct file_operations isdn_fops open: isdn_divert_open, release: isdn_divert_close, }; @@ -2799,7 +2799,7 @@ Index: linux-2.4.35.4/drivers/isdn/divert/divert_procfs.c /****************************/ /* isdn subdir in /proc/net */ -@@ -302,8 +319,16 @@ +@@ -302,8 +319,16 @@ divert_dev_init(void) remove_proc_entry("isdn", proc_net); return (-1); } @@ -2818,15 +2818,15 @@ Index: linux-2.4.35.4/drivers/isdn/divert/divert_procfs.c 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 2007-12-15 05:19:39.650680601 +0100 -+++ linux-2.4.35.4/drivers/isdn/divert/isdn_divert.c 2007-12-15 05:19:55.523585147 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/divert/isdn_divert.c ++++ linux-2.4.35.4/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$ * * DSS1 main diversion supplementary handling for i4l. * -@@ -84,6 +84,9 @@ +@@ -84,6 +84,9 @@ static void deflect_timer_expire(ulong a restore_flags(flags); break; @@ -2836,7 +2836,7 @@ Index: linux-2.4.35.4/drivers/isdn/divert/isdn_divert.c case DEFLECT_AUTODEL: default: save_flags(flags); -@@ -452,6 +455,7 @@ +@@ -452,6 +455,7 @@ int isdn_divert_icall(isdn_ctrl *ic) case DEFLECT_PROCEED: case DEFLECT_REPORT: case DEFLECT_REJECT: @@ -2844,7 +2844,7 @@ Index: linux-2.4.35.4/drivers/isdn/divert/isdn_divert.c if (dv->rule.action == DEFLECT_PROCEED) if ((!if_used) || ((!extern_wait_max) && (!dv->rule.waittime))) return(0); /* no external deflection needed */ -@@ -495,6 +499,11 @@ +@@ -495,6 +499,11 @@ int isdn_divert_icall(isdn_ctrl *ic) else { cs->deflect_dest[0] = '\0'; retval = 4; /* only proceed */ @@ -2856,7 +2856,7 @@ Index: linux-2.4.35.4/drivers/isdn/divert/isdn_divert.c } sprintf(cs->info,"%d 0x%lx %s %s %s %s 0x%x 0x%x %d %d %s\n", cs->akt_state, -@@ -739,6 +748,18 @@ +@@ -739,6 +748,18 @@ int prot_stat_callback(isdn_ctrl *ic) } @@ -2877,8 +2877,8 @@ Index: linux-2.4.35.4/drivers/isdn/divert/isdn_divert.c 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 2007-12-15 05:19:39.658681057 +0100 -+++ linux-2.4.35.4/drivers/isdn/divert/isdn_divert.h 2007-12-15 05:19:55.523585147 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/divert/isdn_divert.h ++++ linux-2.4.35.4/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$ @@ -2899,7 +2899,7 @@ Index: linux-2.4.35.4/drivers/isdn/divert/isdn_divert.h #define DEFLECT_AUTODEL 255 /* only for internal use */ #define DEFLECT_ALL_IDS 0xFFFFFFFF /* all drivers selected */ -@@ -60,6 +61,7 @@ +@@ -60,6 +61,7 @@ typedef struct 2 = report call, send proceed, wait max waittime secs 3 = report call, alert and deflect after waittime 4 = report call, reject immediately @@ -2909,8 +2909,8 @@ Index: linux-2.4.35.4/drivers/isdn/divert/isdn_divert.h 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 2007-12-15 05:19:39.666681515 +0100 -+++ linux-2.4.35.4/drivers/isdn/eicon/Divas_mod.c 2007-12-15 05:19:55.523585147 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/eicon/Divas_mod.c ++++ linux-2.4.35.4/drivers/isdn/eicon/Divas_mod.c @@ -20,6 +20,7 @@ #include "adapter.h" #include "uxio.h" @@ -2921,9 +2921,9 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/Divas_mod.c 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 2007-12-15 05:19:39.670681741 +0100 -+++ linux-2.4.35.4/drivers/isdn/eicon/common.c 2007-12-15 05:19:55.523585147 +0100 -@@ -808,9 +808,7 @@ +--- linux-2.4.35.4.orig/drivers/isdn/eicon/common.c ++++ linux-2.4.35.4/drivers/isdn/eicon/common.c +@@ -808,9 +808,7 @@ void DivasDoDpc(void *pData) while(i--) { @@ -2936,15 +2936,15 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/common.c Index: linux-2.4.35.4/drivers/isdn/eicon/eicon.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon.h 2007-12-15 05:19:39.678682197 +0100 -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon.h 2007-12-15 05:19:55.523585147 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon.h ++++ linux-2.4.35.4/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 $ * * ISDN low-level module for Eicon active ISDN-Cards. * -@@ -347,19 +347,19 @@ +@@ -347,19 +347,19 @@ typedef struct eicon_card { extern char *eicon_ctype_name[]; @@ -2969,8 +2969,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon.h 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 2007-12-15 05:19:39.686682655 +0100 -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_dsp.h 2007-12-15 05:19:55.523585147 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_dsp.h ++++ linux-2.4.35.4/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 $ @@ -2979,8 +2979,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_dsp.h * 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 2007-12-15 05:19:39.694683110 +0100 -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.c 2007-12-15 05:19:55.527585376 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_idi.c ++++ linux-2.4.35.4/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 $ @@ -2996,7 +2996,7 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.c eicon_manifbuf *manbuf; -@@ -1583,6 +1583,37 @@ +@@ -1583,6 +1583,37 @@ idi_faxdata_rcv(eicon_card *ccard, eicon return; } @@ -3034,7 +3034,7 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.c if (chan->fax->direction == ISDN_TTY_FAX_CONN_IN) { -@@ -2054,8 +2085,7 @@ +@@ -2054,8 +2085,7 @@ idi_faxdata_send(eicon_card *ccard, eico OutBuf.Len++; } else { *OutBuf.Next++ = 0; @@ -3044,7 +3044,7 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.c OutBuf.Len += 3; } memcpy(OutBuf.Next, LineBuf.Data, LineBuf.Len); -@@ -2385,6 +2415,12 @@ +@@ -2385,6 +2415,12 @@ idi_handle_ind(eicon_card *ccard, struct } else { if (chan->e.B2Id) idi_do_req(ccard, chan, REMOVE, 1); @@ -3059,8 +3059,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.c 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 2007-12-15 05:19:39.698683336 +0100 -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.h 2007-12-15 05:19:55.527585376 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_idi.h ++++ linux-2.4.35.4/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 $ @@ -3069,8 +3069,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_idi.h * 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 2007-12-15 05:19:39.706683794 +0100 -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_io.c 2007-12-15 05:19:55.531585602 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_io.c ++++ linux-2.4.35.4/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 $ @@ -3079,8 +3079,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_io.c * 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 2007-12-15 05:19:39.714684250 +0100 -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.c 2007-12-15 05:19:55.531585602 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_isa.c ++++ linux-2.4.35.4/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 $ @@ -3096,7 +3096,7 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.c #undef EICON_MCA_DEBUG -@@ -38,8 +38,12 @@ +@@ -38,8 +38,12 @@ static int eicon_isa_valid_irq[] = { static void eicon_isa_release_shmem(eicon_isa_card *card) { if (card->mvalid) { @@ -3109,7 +3109,7 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.c } card->mvalid = 0; } -@@ -94,12 +98,20 @@ +@@ -94,12 +98,20 @@ eicon_isa_find_card(int Mem, int Irq, ch Mem, Id); return -1; } @@ -3130,7 +3130,7 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.c writew(0x55aa, amem + 0x402); if (readw(amem + 0x402) != 0x55aa) primary = 0; writew(0, amem + 0x402); -@@ -109,12 +121,16 @@ +@@ -109,12 +121,16 @@ eicon_isa_find_card(int Mem, int Irq, ch if (primary) { printk(KERN_INFO "Eicon: assuming pri card at 0x%x\n", Mem); writeb(0, amem + 0x3ffe); @@ -3147,7 +3147,7 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.c return EICON_CTYPE_ISABRI; } return -1; -@@ -151,6 +167,7 @@ +@@ -151,6 +167,7 @@ eicon_isa_bootload(eicon_isa_card *card, else card->ramsize = RAMSIZE; @@ -3155,7 +3155,7 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.c if (check_mem_region(card->physmem, card->ramsize)) { printk(KERN_WARNING "eicon_isa_boot: memory at 0x%lx already in use.\n", card->physmem); -@@ -159,6 +176,16 @@ +@@ -159,6 +176,16 @@ eicon_isa_bootload(eicon_isa_card *card, } request_mem_region(card->physmem, card->ramsize, "Eicon ISA ISDN"); card->shmem = (eicon_isa_shmem *) ioremap(card->physmem, card->ramsize); @@ -3174,8 +3174,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.c #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 2007-12-15 05:19:39.722684705 +0100 -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.h 2007-12-15 05:19:55.531585602 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_isa.h ++++ linux-2.4.35.4/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 $ @@ -3184,8 +3184,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_isa.h * Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_mod.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_mod.c 2007-12-15 05:19:39.726684934 +0100 -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_mod.c 2007-12-15 05:19:55.531585602 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_mod.c ++++ linux-2.4.35.4/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 $ @@ -3201,7 +3201,7 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_mod.c extern char *eicon_pci_revision; extern char *eicon_isa_revision; -@@ -639,6 +639,18 @@ +@@ -639,6 +639,18 @@ if_command(isdn_ctrl * c) static int if_writecmd(const u_char * buf, int len, int user, int id, int channel) { @@ -3220,7 +3220,7 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_mod.c return (len); } -@@ -665,11 +677,8 @@ +@@ -665,11 +677,8 @@ if_readstatus(u_char * buf, int len, int else cnt = skb->len; @@ -3233,7 +3233,7 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_mod.c else memcpy(p, skb->data, cnt); -@@ -1459,6 +1468,7 @@ +@@ -1459,6 +1468,7 @@ eicon_exit(void) #ifndef MODULE @@ -3241,7 +3241,7 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_mod.c static int __init eicon_setup(char *line) { -@@ -1467,6 +1477,12 @@ +@@ -1467,6 +1477,12 @@ eicon_setup(char *line) char *str; str = get_options(line, 4, ints); @@ -3254,7 +3254,7 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_mod.c argc = ints[0]; i = 1; -@@ -1494,9 +1510,13 @@ +@@ -1494,9 +1510,13 @@ eicon_setup(char *line) #else printk(KERN_INFO "Eicon ISDN active driver setup\n"); #endif @@ -3270,8 +3270,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_mod.c Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_pci.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_pci.c 2007-12-15 05:19:39.734685390 +0100 -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_pci.c 2007-12-15 05:19:55.535585832 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_pci.c ++++ linux-2.4.35.4/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 $ @@ -3289,8 +3289,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_pci.c #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 2007-12-15 05:19:39.742685845 +0100 -+++ linux-2.4.35.4/drivers/isdn/eicon/eicon_pci.h 2007-12-15 05:19:55.535585832 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/eicon/eicon_pci.h ++++ linux-2.4.35.4/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 $ @@ -3299,9 +3299,9 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/eicon_pci.h * Index: linux-2.4.35.4/drivers/isdn/eicon/fourbri.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/fourbri.c 2007-12-15 05:19:39.750686300 +0100 -+++ linux-2.4.35.4/drivers/isdn/eicon/fourbri.c 2007-12-15 05:19:55.535585832 +0100 -@@ -337,8 +337,7 @@ +--- linux-2.4.35.4.orig/drivers/isdn/eicon/fourbri.c ++++ linux-2.4.35.4/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) { byte *ctl; @@ -3313,8 +3313,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/fourbri.c 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 2007-12-15 05:19:39.754686529 +0100 -+++ linux-2.4.35.4/drivers/isdn/eicon/kprintf.c 2007-12-15 05:19:55.535585832 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/eicon/kprintf.c ++++ linux-2.4.35.4/drivers/isdn/eicon/kprintf.c @@ -18,6 +18,468 @@ #include "divalog.h" #include "uxio.h" @@ -3784,7 +3784,7 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/kprintf.c void DivasPrintf(char *fmt, ...) { -@@ -40,7 +502,7 @@ +@@ -40,7 +502,7 @@ void DivasPrintf(char *fmt, ...) /* call vsprintf to format the user's information */ @@ -3795,8 +3795,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/kprintf.c Index: linux-2.4.35.4/drivers/isdn/eicon/lincfg.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/lincfg.c 2007-12-15 05:19:39.762686985 +0100 -+++ linux-2.4.35.4/drivers/isdn/eicon/lincfg.c 2007-12-15 05:19:55.535585832 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/eicon/lincfg.c ++++ linux-2.4.35.4/drivers/isdn/eicon/lincfg.c @@ -26,6 +26,9 @@ #include "uxio.h" @@ -3809,9 +3809,9 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/lincfg.c Index: linux-2.4.35.4/drivers/isdn/eicon/linchr.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/linchr.c 2007-12-15 05:19:39.770687440 +0100 -+++ linux-2.4.35.4/drivers/isdn/eicon/linchr.c 2007-12-15 05:19:55.539586058 +0100 -@@ -154,17 +154,17 @@ +--- linux-2.4.35.4.orig/drivers/isdn/eicon/linchr.c ++++ linux-2.4.35.4/drivers/isdn/eicon/linchr.c +@@ -154,17 +154,17 @@ ssize_t do_read(struct file *pFile, char klog_t *pHeadItem; if (BufferSize < sizeof(klog_t)) @@ -3836,8 +3836,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/linchr.c } Index: linux-2.4.35.4/drivers/isdn/eicon/linio.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/eicon/linio.c 2007-12-15 05:19:39.778687896 +0100 -+++ linux-2.4.35.4/drivers/isdn/eicon/linio.c 2007-12-15 05:19:55.539586058 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/eicon/linio.c ++++ linux-2.4.35.4/drivers/isdn/eicon/linio.c @@ -15,6 +15,7 @@ #include <linux/slab.h> #include <linux/pci.h> @@ -3848,8 +3848,8 @@ Index: linux-2.4.35.4/drivers/isdn/eicon/linio.c #include "uxio.h" Index: linux-2.4.35.4/drivers/isdn/hisax/Makefile =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/Makefile 2007-12-15 05:19:39.786688354 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/Makefile 2007-12-15 05:19:55.539586058 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/Makefile ++++ linux-2.4.35.4/drivers/isdn/hisax/Makefile @@ -4,20 +4,17 @@ O_TARGET := vmlinux-obj.o @@ -3874,7 +3874,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/Makefile # Optional parts of multipart objects. hisax-objs-$(CONFIG_HISAX_EURO) += l3dss1.o -@@ -33,7 +30,7 @@ +@@ -33,7 +30,7 @@ hisax-objs-$(CONFIG_HISAX_AVM_A1_PCMCIA) hisax-objs-$(CONFIG_HISAX_FRITZPCI) += avm_pci.o isac.o arcofi.o hisax-objs-$(CONFIG_HISAX_ELSA) += elsa.o isac.o arcofi.o hscx.o hisax-objs-$(CONFIG_HISAX_IX1MICROR2) += ix1_micro.o isac.o arcofi.o hscx.o @@ -3883,7 +3883,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/Makefile hisax-objs-$(CONFIG_HISAX_ASUSCOM) += asuscom.o isac.o arcofi.o hscx.o hisax-objs-$(CONFIG_HISAX_TELEINT) += teleint.o isac.o arcofi.o hfc_2bs0.o hisax-objs-$(CONFIG_HISAX_SEDLBAUER) += sedlbauer.o isac.o arcofi.o hscx.o isar.o -@@ -44,6 +41,7 @@ +@@ -44,6 +41,7 @@ hisax-objs-$(CONFIG_HISAX_NETJET_U) += n hisax-objs-$(CONFIG_HISAX_HFCS) += hfcscard.o hfc_2bds0.o hisax-objs-$(CONFIG_HISAX_HFC_PCI) += hfc_pci.o hisax-objs-$(CONFIG_HISAX_HFC_SX) += hfc_sx.o @@ -3891,7 +3891,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/Makefile hisax-objs-$(CONFIG_HISAX_NICCY) += niccy.o isac.o arcofi.o hscx.o hisax-objs-$(CONFIG_HISAX_ISURF) += isurf.o isac.o arcofi.o isar.o hisax-objs-$(CONFIG_HISAX_HSTSAPHIR) += saphir.o isac.o arcofi.o hscx.o -@@ -51,7 +49,6 @@ +@@ -51,7 +49,6 @@ hisax-objs-$(CONFIG_HISAX_BKM_A4T) += bk hisax-objs-$(CONFIG_HISAX_SCT_QUADRO) += bkm_a8.o isac.o arcofi.o hscx.o hisax-objs-$(CONFIG_HISAX_GAZEL) += gazel.o isac.o arcofi.o hscx.o hisax-objs-$(CONFIG_HISAX_W6692) += w6692.o @@ -3899,7 +3899,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/Makefile #hisax-objs-$(CONFIG_HISAX_TESTEMU) += testemu.o hisax-objs += $(sort $(hisax-objs-y)) -@@ -61,10 +58,9 @@ +@@ -61,10 +58,9 @@ hisax-objs += $(sort $(hisax-objs-y)) obj-$(CONFIG_ISDN_DRV_HISAX) += hisax.o obj-$(CONFIG_HISAX_SEDLBAUER_CS) += sedlbauer_cs.o obj-$(CONFIG_HISAX_ELSA_CS) += elsa_cs.o @@ -3915,8 +3915,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/Makefile CFLAGS_cert.o := -DCERTIFICATION=$(CERT) Index: linux-2.4.35.4/drivers/isdn/hisax/amd7930.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/isdn/hisax/amd7930.c 2007-12-15 05:19:55.539586058 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/isdn/hisax/amd7930.c @@ -0,0 +1,755 @@ +/* $Id: amd7930.c,v 1.8 2001/09/24 13:22:55 kai Exp $ + * @@ -4675,8 +4675,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/amd7930.c +} Index: linux-2.4.35.4/drivers/isdn/hisax/arcofi.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/arcofi.c 2007-12-15 05:19:39.798689035 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/arcofi.c 2007-12-15 05:19:55.539586058 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/arcofi.c ++++ linux-2.4.35.4/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 $ @@ -4685,8 +4685,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/arcofi.c * Index: linux-2.4.35.4/drivers/isdn/hisax/arcofi.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/arcofi.h 2007-12-15 05:19:39.802689264 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/arcofi.h 2007-12-15 05:19:55.543586286 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/arcofi.h ++++ linux-2.4.35.4/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$ @@ -4695,8 +4695,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/arcofi.h * Index: linux-2.4.35.4/drivers/isdn/hisax/asuscom.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/asuscom.c 2007-12-15 05:19:39.810689720 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/asuscom.c 2007-12-15 05:19:55.543586286 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/asuscom.c ++++ linux-2.4.35.4/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 $ @@ -4720,7 +4720,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/asuscom.c #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) -@@ -310,27 +309,6 @@ +@@ -310,27 +309,6 @@ Asus_card_msg(struct IsdnCardState *cs, return(0); } @@ -4748,7 +4748,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/asuscom.c int __init setup_asuscom(struct IsdnCard *card) { -@@ -343,45 +321,7 @@ +@@ -343,45 +321,7 @@ setup_asuscom(struct IsdnCard *card) printk(KERN_INFO "HiSax: Asuscom ISDNLink driver Rev. %s\n", HiSax_getrev(tmp)); if (cs->typ != ISDN_CTYPE_ASUSCOM) return (0); @@ -4797,8 +4797,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/asuscom.c 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 2007-12-15 05:19:39.818690175 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/avm_a1.c 2007-12-15 05:19:55.543586286 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/avm_a1.c ++++ linux-2.4.35.4/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 $ @@ -4816,8 +4816,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/avm_a1.c #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 2007-12-15 05:19:39.826690633 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/avm_a1p.c 2007-12-15 05:19:55.543586286 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/avm_a1p.c ++++ linux-2.4.35.4/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 $ @@ -4835,8 +4835,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/avm_a1p.c 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 2007-12-15 05:19:39.830690859 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/avm_pci.c 2007-12-15 05:19:55.543586286 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/avm_pci.c ++++ linux-2.4.35.4/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 $ @@ -4857,7 +4857,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/avm_pci.c #define AVM_FRITZ_PCI 1 #define AVM_FRITZ_PNP 2 -@@ -291,8 +291,7 @@ +@@ -291,8 +291,7 @@ hdlc_empty_fifo(struct BCState *bcs, int debugl1(cs, "hdlc_empty_fifo: incoming packet too large"); return; } @@ -4867,7 +4867,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/avm_pci.c bcs->hw.hdlc.rcvidx += count; if (cs->subtyp == AVM_FRITZ_PCI) { outl(idx, cs->hw.avm.cfg_reg + 4); -@@ -353,8 +352,7 @@ +@@ -353,8 +352,7 @@ hdlc_fill_fifo(struct BCState *bcs) } if ((cs->debug & L1_DEB_HSCX) && !(cs->debug & L1_DEB_HSCX_FIFO)) debugl1(cs, "hdlc_fill_fifo %d/%ld", count, bcs->tx_skb->len); @@ -4877,7 +4877,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/avm_pci.c skb_pull(bcs->tx_skb, count); bcs->tx_cnt -= count; bcs->hw.hdlc.count += count; -@@ -766,10 +764,6 @@ +@@ -766,10 +764,6 @@ AVM_card_msg(struct IsdnCardState *cs, i } static struct pci_dev *dev_avm __initdata = NULL; @@ -4888,7 +4888,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/avm_pci.c int __init setup_avm_pcipnp(struct IsdnCard *card) -@@ -783,47 +777,10 @@ +@@ -783,47 +777,10 @@ setup_avm_pcipnp(struct IsdnCard *card) if (cs->typ != ISDN_CTYPE_FRITZPCI) return (0); if (card->para[1]) { @@ -4936,7 +4936,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/avm_pci.c #if CONFIG_PCI if (!pci_present()) { printk(KERN_ERR "FritzPCI: no PCI bus present\n"); -@@ -838,7 +795,7 @@ +@@ -838,7 +795,7 @@ setup_avm_pcipnp(struct IsdnCard *card) } if (pci_enable_device(dev_avm)) return(0); @@ -4945,7 +4945,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/avm_pci.c if (!cs->hw.avm.cfg_reg) { printk(KERN_ERR "FritzPCI: No IO-Adr for PCI card found\n"); return(0); -@@ -854,7 +811,6 @@ +@@ -854,7 +811,6 @@ setup_avm_pcipnp(struct IsdnCard *card) return (0); #endif /* CONFIG_PCI */ } @@ -4955,8 +4955,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/avm_pci.c 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 2007-12-15 05:19:39.838691315 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/bkm_a4t.c 2007-12-15 05:19:55.547586516 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/bkm_a4t.c ++++ linux-2.4.35.4/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 $ @@ -4977,7 +4977,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_a4t.c static inline u_char -@@ -293,13 +294,13 @@ +@@ -293,13 +294,13 @@ setup_bkm_a4t(struct IsdnCard *card) u16 sub_sys; u16 sub_vendor; @@ -4996,8 +4996,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_a4t.c } Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_a8.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/bkm_a8.c 2007-12-15 05:19:39.846691773 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/bkm_a8.c 2007-12-15 05:19:55.547586516 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/bkm_a8.c ++++ linux-2.4.35.4/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 $ @@ -5021,7 +5021,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_a8.c static const char *sct_quadro_subtypes[] = { -@@ -329,13 +330,13 @@ +@@ -329,13 +330,13 @@ setup_sct_quadro(struct IsdnCard *card) while ((dev_a8 = pci_find_device(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, dev_a8))) { @@ -5038,7 +5038,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_a8.c pci_irq = dev_a8->irq; pci_bus = dev_a8->bus->number; pci_device_fn = dev_a8->devfn; -@@ -365,7 +366,7 @@ +@@ -365,7 +366,7 @@ setup_sct_quadro(struct IsdnCard *card) pci_ioaddr1 &= PCI_BASE_ADDRESS_IO_MASK; pcibios_write_config_dword(pci_bus, pci_device_fn, PCI_BASE_ADDRESS_1, pci_ioaddr1); @@ -5049,8 +5049,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_a8.c } Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_ax.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/bkm_ax.h 2007-12-15 05:19:39.854692228 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/bkm_ax.h 2007-12-15 05:19:55.547586516 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/bkm_ax.h ++++ linux-2.4.35.4/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$ @@ -5059,8 +5059,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/bkm_ax.h * Index: linux-2.4.35.4/drivers/isdn/hisax/callc.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/callc.c 2007-12-15 05:19:39.862692684 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/callc.c 2007-12-15 05:19:55.547586516 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/callc.c ++++ linux-2.4.35.4/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 $ @@ -5076,7 +5076,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/callc.c extern struct IsdnCard cards[]; extern int nrcards; -@@ -145,9 +145,11 @@ +@@ -145,9 +145,11 @@ enum { EV_PROCEED, /* 20 */ EV_ALERT, /* 21 */ EV_REDIR, /* 22 */ @@ -5089,7 +5089,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/callc.c static char *strEvent[] = { -@@ -174,6 +176,8 @@ +@@ -174,6 +176,8 @@ static char *strEvent[] = "EV_PROCEED", "EV_ALERT", "EV_REDIR", @@ -5098,7 +5098,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/callc.c }; -@@ -286,6 +290,22 @@ +@@ -286,6 +290,22 @@ lli_prep_dialout(struct FsmInst *fi, int } static void @@ -5121,7 +5121,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/callc.c lli_resume(struct FsmInst *fi, int event, void *arg) { struct Channel *chanp = fi->userdata; -@@ -784,6 +804,8 @@ +@@ -784,6 +804,8 @@ static struct FsmNode fnlist[] __initdat {ST_OUT_DIAL, EV_DISCONNECT_IND, lli_release_req}, {ST_OUT_DIAL, EV_RELEASE, lli_dhup_close}, {ST_OUT_DIAL, EV_NOSETUP_RSP, lli_no_setup_rsp}, @@ -5130,7 +5130,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/callc.c {ST_OUT_DIAL, EV_SETUP_ERR, lli_error}, {ST_IN_WAIT_LL, EV_LEASED_REL, lli_failure_l}, {ST_IN_WAIT_LL, EV_ACCEPTD, lli_setup_rsp}, -@@ -925,7 +947,7 @@ +@@ -925,7 +947,7 @@ static void stat_redir_result(struct Isd ic.driver = cs->myid; ic.command = ISDN_STAT_REDIR; ic.arg = chan; @@ -5139,7 +5139,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/callc.c cs->iif.statcallb(&ic); } /* stat_redir_result */ -@@ -997,8 +1019,13 @@ +@@ -997,8 +1019,13 @@ dchan_l3l4(struct PStack *st, int pr, vo FsmEvent(&chanp->fi, EV_RELEASE, NULL); break; case (CC_PROCEED_SEND | INDICATION): @@ -5155,8 +5155,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/callc.c break; Index: linux-2.4.35.4/drivers/isdn/hisax/cert.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/cert.c 2007-12-15 05:19:39.866692913 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/cert.c 2007-12-15 05:19:55.551586742 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/cert.c ++++ linux-2.4.35.4/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 $ @@ -5165,8 +5165,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/cert.c * 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 2007-12-15 05:19:39.874693368 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/config.c 2007-12-15 05:19:55.551586742 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/config.c ++++ linux-2.4.35.4/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 $ @@ -5195,7 +5195,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c * * protocol can be either ISDN_PTYPE_EURO or ISDN_PTYPE_1TR6 or ISDN_PTYPE_NI1 * -@@ -95,11 +99,17 @@ +@@ -95,11 +99,17 @@ const char *CardType[] = { "Siemens I-Surf", "Acer P10", "HST Saphir", "Telekom A4T", "Scitel Quadro", "Gazel", "HFC 2BDS0 PCI", "Winbond 6692", "HFC 2BDS0 SX", "NETspider-U", "HFC-2BDS0-SP PCMCIA", @@ -5214,7 +5214,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c #ifdef CONFIG_HISAX_ELSA #define DEFAULT_CARD ISDN_CTYPE_ELSA #define DEFAULT_CFG {0,0,0,0} -@@ -339,19 +349,27 @@ +@@ -339,19 +349,27 @@ EXPORT_SYMBOL(HiSax_closecard); NULL, \ } @@ -5248,7 +5248,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c #undef IO0_IO1 #ifdef CONFIG_HISAX_16_3 #define IO0_IO1 -@@ -361,27 +379,23 @@ +@@ -361,27 +379,23 @@ static int io[HISAX_MAX_CARDS] __devinit #define IO0_IO1 #endif #ifdef IO0_IO1 @@ -5287,7 +5287,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c #endif #endif /* MODULE */ -@@ -432,6 +446,7 @@ +@@ -432,6 +446,7 @@ void __init HiSaxVersion(void) } #ifndef MODULE @@ -5295,7 +5295,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c #define MAX_ARG (HISAX_MAX_CARDS*5) static int __init HiSax_setup(char *line) { -@@ -440,12 +455,16 @@ +@@ -440,12 +455,16 @@ static int __init HiSax_setup(char *line char *str; str = get_options(line, MAX_ARG, ints); @@ -5313,7 +5313,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c if (argc) { cards[i].typ = ints[j]; j++; -@@ -473,19 +492,21 @@ +@@ -473,19 +492,21 @@ static int __init HiSax_setup(char *line } i++; } @@ -5343,7 +5343,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c #endif /* MODULES */ #if CARD_TELES0 -@@ -560,6 +581,10 @@ +@@ -560,6 +581,10 @@ extern int setup_hfcs(struct IsdnCard *c extern int setup_hfcpci(struct IsdnCard *card); #endif @@ -5354,7 +5354,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c #if CARD_HFC_SX extern int setup_hfcsx(struct IsdnCard *card); #endif -@@ -604,10 +629,6 @@ +@@ -604,10 +629,6 @@ extern int setup_w6692(struct IsdnCard * extern int setup_netjet_u(struct IsdnCard *card); #endif @@ -5365,7 +5365,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c /* * Find card with given driverId */ -@@ -899,7 +920,8 @@ +@@ -899,7 +920,8 @@ static int __devinit init_card(struct Is return 3; } @@ -5375,7 +5375,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c { long flags; int ret = 0; -@@ -1093,6 +1115,12 @@ +@@ -1093,6 +1115,12 @@ static int __devinit checkcard(int cardn ret = setup_hfcsx(card); break; #endif @@ -5388,7 +5388,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c #if CARD_NICCY case ISDN_CTYPE_NICCY: ret = setup_niccy(card); -@@ -1143,11 +1171,6 @@ +@@ -1143,11 +1171,6 @@ static int __devinit checkcard(int cardn ret = setup_netjet_u(card); break; #endif @@ -5400,7 +5400,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c case ISDN_CTYPE_DYNAMIC: ret = 2; break; -@@ -1186,6 +1209,9 @@ +@@ -1186,6 +1209,9 @@ static int __devinit checkcard(int cardn case ISDN_CTYPE_DYNAMIC: ret = 0; break; @@ -5410,7 +5410,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c default: ret = init_card(cs); break; -@@ -1257,16 +1283,13 @@ +@@ -1257,16 +1283,13 @@ int __devinit HiSax_inithardware(int *bu else sprintf(ids, "%s%d", id, i); } @@ -5431,7 +5431,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c HiSax_shiftcards(i); nrcards--; } -@@ -1342,6 +1365,49 @@ +@@ -1342,6 +1365,49 @@ void HiSax_reportcard(int cardnr, int se #endif } @@ -5481,7 +5481,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c static int __init HiSax_init(void) { int i, retval; -@@ -1408,8 +1474,6 @@ +@@ -1408,8 +1474,6 @@ static int __init HiSax_init(void) if (protocol[i]) { cards[j].protocol = protocol[i]; nzproto++; @@ -5490,7 +5490,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c } switch (type[i]) { case ISDN_CTYPE_16_0: -@@ -1487,22 +1551,15 @@ +@@ -1487,22 +1551,15 @@ static int __init HiSax_init(void) } else { /* QUADRO is a 4 BRI card */ cards[j++].para[0] = 1; @@ -5522,7 +5522,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c } break; } -@@ -1526,10 +1583,15 @@ +@@ -1526,10 +1583,15 @@ static int __init HiSax_init(void) nrcards, (nrcards > 1) ? "s" : ""); /* Install only, if at least one card found */ @@ -5540,7 +5540,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c out_tei: TeiFree(); out_isdnl2: -@@ -1576,8 +1638,6 @@ +@@ -1576,8 +1638,6 @@ int elsa_init_pcmcia(void *pcm_iob, int cards[i].typ = type[i]; if (protocol[i]) { cards[i].protocol = protocol[i]; @@ -5549,7 +5549,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c } } cards[0].para[0] = pcm_irq; -@@ -1595,8 +1655,7 @@ +@@ -1595,8 +1655,7 @@ int elsa_init_pcmcia(void *pcm_iob, int printk(KERN_DEBUG "HiSax: Total %d card%s defined\n", nrcards, (nrcards > 1) ? "s" : ""); @@ -5559,7 +5559,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c printk(KERN_NOTICE "HiSax: module installed\n"); #endif return 0; -@@ -1619,8 +1678,6 @@ +@@ -1619,8 +1678,6 @@ int hfc_init_pcmcia(void *pcm_iob, int p cards[i].typ = type[i]; if (protocol[i]) { cards[i].protocol = protocol[i]; @@ -5568,7 +5568,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c } } cards[0].para[0] = pcm_irq; -@@ -1638,8 +1695,7 @@ +@@ -1638,8 +1695,7 @@ int hfc_init_pcmcia(void *pcm_iob, int p printk(KERN_DEBUG "HiSax: Total %d card%s defined\n", nrcards, (nrcards > 1) ? "s" : ""); @@ -5578,7 +5578,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c printk(KERN_NOTICE "HiSax: module installed\n"); #endif return 0; -@@ -1662,8 +1718,6 @@ +@@ -1662,8 +1718,6 @@ int sedl_init_pcmcia(void *pcm_iob, int cards[i].typ = type[i]; if (protocol[i]) { cards[i].protocol = protocol[i]; @@ -5587,7 +5587,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c } } cards[0].para[0] = pcm_irq; -@@ -1681,8 +1735,7 @@ +@@ -1681,8 +1735,7 @@ int sedl_init_pcmcia(void *pcm_iob, int printk(KERN_DEBUG "HiSax: Total %d card%s defined\n", nrcards, (nrcards > 1) ? "s" : ""); @@ -5597,7 +5597,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c printk(KERN_NOTICE "HiSax: module installed\n"); #endif return 0; -@@ -1705,8 +1758,6 @@ +@@ -1705,8 +1758,6 @@ int avm_a1_init_pcmcia(void *pcm_iob, in cards[i].typ = type[i]; if (protocol[i]) { cards[i].protocol = protocol[i]; @@ -5606,7 +5606,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c } } cards[0].para[0] = pcm_irq; -@@ -1724,8 +1775,7 @@ +@@ -1724,8 +1775,7 @@ int avm_a1_init_pcmcia(void *pcm_iob, in printk(KERN_DEBUG "HiSax: Total %d card%s defined\n", nrcards, (nrcards > 1) ? "s" : ""); @@ -5616,7 +5616,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c printk(KERN_NOTICE "HiSax: module installed\n"); #endif return 0; -@@ -1743,7 +1793,7 @@ +@@ -1743,7 +1793,7 @@ int __devinit hisax_init_pcmcia(void *pc sprintf(ids, "HiSax%d", nrcards); else sprintf(ids, "HiSax"); @@ -5625,7 +5625,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c return -1; } ret = nrcards; -@@ -1785,7 +1835,7 @@ +@@ -1785,7 +1835,7 @@ int hisax_register(struct hisax_d_if *hi cards[i].protocol = protocol; sprintf(id, "%s%d", name, i); nrcards++; @@ -5634,7 +5634,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c if (retval == 0) { // yuck cards[i].typ = 0; nrcards--; -@@ -2117,9 +2167,6 @@ +@@ -2117,9 +2167,6 @@ static struct pci_device_id hisax_pci_tb {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20, PCI_ANY_ID, PCI_ANY_ID}, {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20_U, PCI_ANY_ID, PCI_ANY_ID}, {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA201, PCI_ANY_ID, PCI_ANY_ID}, @@ -5644,7 +5644,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c #endif #ifdef CONFIG_HISAX_ELSA {PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_MICROLINK, PCI_ANY_ID, PCI_ANY_ID}, -@@ -2178,11 +2225,3 @@ +@@ -2178,11 +2225,3 @@ MODULE_DEVICE_TABLE(pci, hisax_pci_tbl); module_init(HiSax_init); module_exit(HiSax_exit); @@ -5658,8 +5658,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/config.c -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 2007-12-15 05:19:39.882693823 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/diva.c 2007-12-15 05:19:55.551586742 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/diva.c ++++ linux-2.4.35.4/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 $ @@ -5683,7 +5683,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) -@@ -51,7 +50,6 @@ +@@ -51,7 +50,6 @@ const char *Diva_revision = "$Revision: #define DIVA_PCI 2 #define DIVA_IPAC_ISA 3 #define DIVA_IPAC_PCI 4 @@ -5691,7 +5691,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c /* CTRL (Read) */ #define DIVA_IRQ_STAT 0x01 -@@ -71,12 +69,10 @@ +@@ -71,12 +69,10 @@ const char *Diva_revision = "$Revision: #define PITA_MISC_REG 0x1c #ifdef __BIG_ENDIAN #define PITA_PARA_SOFTRESET 0x00000001 @@ -5704,7 +5704,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c #define PITA_PARA_MPX_MODE 0x04000000 #define PITA_INT0_ENABLE 0x00020000 #endif -@@ -244,47 +240,6 @@ +@@ -244,47 +240,6 @@ MemWriteHSCX(struct IsdnCardState *cs, i memwritereg(cs->hw.diva.cfg_reg, offset + (hscx ? 0x40 : 0), value); } @@ -5752,7 +5752,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c /* * fast interrupt HSCX stuff goes here */ -@@ -595,7 +550,7 @@ +@@ -595,7 +550,7 @@ Memhscx_int_main(struct IsdnCardState *c u_char exval; struct BCState *bcs; @@ -5761,7 +5761,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c bcs = cs->bcs + 1; exval = MemReadHSCX(cs, 1, HSCX_EXIR); if (exval & 0x40) { -@@ -622,7 +577,7 @@ +@@ -622,7 +577,7 @@ Memhscx_int_main(struct IsdnCardState *c debugl1(cs, "HSCX B interrupt %x", val); Memhscx_interrupt(cs, val, 1); } @@ -5770,7 +5770,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c bcs = cs->bcs; exval = MemReadHSCX(cs, 0, HSCX_EXIR); if (exval & 0x40) { -@@ -644,7 +599,7 @@ +@@ -644,7 +599,7 @@ Memhscx_int_main(struct IsdnCardState *c } else if (cs->debug & L1_DEB_HSCX) debugl1(cs, "HSCX A EXIR %x", exval); } @@ -5779,7 +5779,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c exval = MemReadHSCX(cs, 0, HSCX_ISTA); if (cs->debug & L1_DEB_HSCX) debugl1(cs, "HSCX A interrupt %x", exval); -@@ -705,31 +660,12 @@ +@@ -705,31 +660,12 @@ Start_IPACPCI: memwritereg(cs->hw.diva.cfg_reg, IPAC_MASK, 0xC0); } @@ -5812,7 +5812,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c u_int *cfg = (unsigned int *)cs->hw.diva.pci_cfg; *cfg = 0; /* disable INT0/1 */ -@@ -776,16 +712,6 @@ +@@ -776,16 +712,6 @@ reset_diva(struct IsdnCardState *cs) set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout((10*HZ)/1000); memwritereg(cs->hw.diva.cfg_reg, IPAC_MASK, 0xc0); @@ -5829,7 +5829,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c } else { /* DIVA 2.0 */ cs->hw.diva.ctrl_reg = 0; /* Reset On */ byteout(cs->hw.diva.ctrl, cs->hw.diva.ctrl_reg); -@@ -814,9 +740,7 @@ +@@ -814,9 +740,7 @@ diva_led_handler(struct IsdnCardState *c { int blink = 0; @@ -5840,7 +5840,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c return; del_timer(&cs->hw.diva.tl); if (cs->hw.diva.status & DIVA_ASSIGN) -@@ -859,12 +783,6 @@ +@@ -859,12 +783,6 @@ Diva_card_msg(struct IsdnCardState *cs, release_io_diva(cs); return(0); case CARD_INIT: @@ -5853,7 +5853,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c if (cs->subtyp == DIVA_IPAC_PCI) { ireg = (unsigned int *)cs->hw.diva.pci_cfg; *ireg = PITA_INT0_ENABLE; -@@ -901,9 +819,7 @@ +@@ -901,9 +819,7 @@ Diva_card_msg(struct IsdnCardState *cs, } break; } @@ -5864,7 +5864,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c diva_led_handler(cs); return(0); } -@@ -911,40 +827,11 @@ +@@ -911,40 +827,11 @@ Diva_card_msg(struct IsdnCardState *cs, static struct pci_dev *dev_diva __initdata = NULL; static struct pci_dev *dev_diva_u __initdata = NULL; static struct pci_dev *dev_diva201 __initdata = NULL; @@ -5906,7 +5906,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c u_char val; struct IsdnCardState *cs = card->cs; char tmp[64]; -@@ -977,75 +864,8 @@ +@@ -977,75 +864,8 @@ setup_diva(struct IsdnCard *card) cs->hw.diva.hscx_adr = card->para[1] + DIVA_HSCX_ADR; } cs->irq = card->para[0]; @@ -5983,7 +5983,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c #if CONFIG_PCI if (!pci_present()) { printk(KERN_ERR "Diva: no PCI bus present\n"); -@@ -1059,14 +879,14 @@ +@@ -1059,14 +879,14 @@ setup_diva(struct IsdnCard *card) return(0); cs->subtyp = DIVA_PCI; cs->irq = dev_diva->irq; @@ -6000,7 +6000,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c } else if ((dev_diva201 = pci_find_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA201, dev_diva201))) { if (pci_enable_device(dev_diva201)) -@@ -1074,19 +894,9 @@ +@@ -1074,19 +894,9 @@ setup_diva(struct IsdnCard *card) cs->subtyp = DIVA_IPAC_PCI; cs->irq = dev_diva201->irq; cs->hw.diva.pci_cfg = @@ -6022,7 +6022,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c } else { printk(KERN_WARNING "Diva: No PCI card found\n"); return(0); -@@ -1107,8 +917,7 @@ +@@ -1107,8 +917,7 @@ setup_diva(struct IsdnCard *card) printk(KERN_WARNING "Diva: unable to config DIVA PCI\n"); return (0); #endif /* CONFIG_PCI */ @@ -6032,7 +6032,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c cs->hw.diva.ctrl = 0; cs->hw.diva.isac = 0; cs->hw.diva.hscx = 0; -@@ -1125,23 +934,18 @@ +@@ -1125,23 +934,18 @@ setup_diva(struct IsdnCard *card) bytecnt = 32; } } @@ -6062,7 +6062,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c if (check_region(cs->hw.diva.cfg_reg, bytecnt)) { printk(KERN_WARNING "HiSax: %s config port %lx-%lx already in use\n", -@@ -1177,17 +981,6 @@ +@@ -1177,17 +981,6 @@ ready: cs->irq_func = &diva_irq_ipac_pci; val = memreadreg(cs->hw.diva.cfg_reg, IPAC_ID); printk(KERN_INFO "Diva: IPAC version %x\n", val); @@ -6082,8 +6082,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/diva.c 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 2007-12-15 05:19:39.890694279 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/elsa.c 2007-12-15 05:19:55.555586971 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/elsa.c ++++ linux-2.4.35.4/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 $ @@ -6106,7 +6106,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/elsa.c const char *Elsa_Types[] = {"None", "PC", "PCC-8", "PCC-16", "PCF", "PCF-Pro", "PCMCIA", "QS 1000", "QS 3000", "Microlink PCI", "QS 3000 PCI", -@@ -864,21 +864,6 @@ +@@ -864,21 +864,6 @@ probe_elsa(struct IsdnCardState *cs) static struct pci_dev *dev_qs1000 __devinitdata = NULL; static struct pci_dev *dev_qs3000 __devinitdata = NULL; @@ -6128,7 +6128,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/elsa.c int __devinit setup_elsa(struct IsdnCard *card) { -@@ -893,7 +878,6 @@ +@@ -893,7 +878,6 @@ setup_elsa(struct IsdnCard *card) cs->hw.elsa.ctrl_reg = 0; cs->hw.elsa.status = 0; cs->hw.elsa.MFlag = 0; @@ -6136,7 +6136,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/elsa.c if (cs->typ == ISDN_CTYPE_ELSA) { cs->hw.elsa.base = card->para[0]; printk(KERN_INFO "Elsa: Microlink IO probing\n"); -@@ -955,60 +939,9 @@ +@@ -955,60 +939,9 @@ setup_elsa(struct IsdnCard *card) return (0); } } else if (cs->typ == ISDN_CTYPE_ELSA_PNP) { @@ -6200,7 +6200,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/elsa.c cs->hw.elsa.cfg = cs->hw.elsa.base + ELSA_CONFIG; cs->hw.elsa.ale = cs->hw.elsa.base + ELSA_ALE; cs->hw.elsa.isac = cs->hw.elsa.base + ELSA_ISAC; -@@ -1058,16 +991,16 @@ +@@ -1058,16 +991,16 @@ setup_elsa(struct IsdnCard *card) return(0); cs->subtyp = ELSA_QS1000PCI; cs->irq = dev_qs1000->irq; @@ -6221,7 +6221,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/elsa.c } else { printk(KERN_WARNING "Elsa: No PCI card found\n"); return(0); -@@ -1123,7 +1056,6 @@ +@@ -1123,7 +1056,6 @@ setup_elsa(struct IsdnCard *card) break; case ELSA_PCFPRO: case ELSA_PCF: @@ -6231,9 +6231,9 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/elsa.c 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 2007-12-15 05:19:39.894694508 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/elsa_cs.c 2007-12-15 05:19:55.555586971 +0100 -@@ -72,7 +72,7 @@ +--- linux-2.4.35.4.orig/drivers/isdn/hisax/elsa_cs.c ++++ linux-2.4.35.4/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); static char *version = @@ -6244,15 +6244,15 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/elsa_cs.c #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 2007-12-15 05:19:39.902694963 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/elsa_ser.c 2007-12-15 05:19:55.555586971 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/elsa_ser.c ++++ linux-2.4.35.4/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 $ * * stuff for the serial modem on ELSA cards * -@@ -396,6 +396,74 @@ +@@ -396,6 +396,74 @@ static inline void transmit_chars(struct } } @@ -6329,8 +6329,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/elsa_ser.c { Index: linux-2.4.35.4/drivers/isdn/hisax/fsm.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/fsm.c 2007-12-15 05:19:39.910695419 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/fsm.c 2007-12-15 05:19:55.555586971 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/fsm.c ++++ linux-2.4.35.4/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$ @@ -6354,8 +6354,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/fsm.c { Index: linux-2.4.35.4/drivers/isdn/hisax/fsm.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/fsm.h 2007-12-15 05:19:39.918695874 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/fsm.h 2007-12-15 05:19:55.555586971 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/fsm.h ++++ linux-2.4.35.4/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$ @@ -6364,8 +6364,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/fsm.h * Index: linux-2.4.35.4/drivers/isdn/hisax/gazel.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/gazel.c 2007-12-15 05:19:39.922696103 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/gazel.c 2007-12-15 05:19:55.559587200 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/gazel.c ++++ linux-2.4.35.4/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 $ @@ -6384,7 +6384,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/gazel.c #define R647 1 #define R685 2 -@@ -563,8 +564,8 @@ +@@ -563,8 +564,8 @@ setup_gazelpci(struct IsdnCardState *cs) if (pci_enable_device(dev_tel)) return 1; pci_irq = dev_tel->irq; @@ -6397,15 +6397,15 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/gazel.c 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 2007-12-15 05:19:39.930696558 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.c 2007-12-15 05:19:55.559587200 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_2bds0.c ++++ linux-2.4.35.4/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 $ * * specific routines for CCD's HFC 2BDS0 * -@@ -616,6 +616,17 @@ +@@ -616,6 +616,17 @@ hfcd_bh(struct IsdnCardState *cs) */ if (!cs) return; @@ -6423,7 +6423,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.c if (test_and_clear_bit(D_L1STATECHANGE, &cs->event)) { switch (cs->dc.hfcd.ph_state) { case (0): -@@ -1090,6 +1101,32 @@ +@@ -1090,6 +1101,32 @@ HFCD_l1hw(struct PStack *st, int pr, voi cs->hw.hfcD.mst_m |= HFCD_MASTER; cs->writeisac(cs, HFCD_MST_MODE, cs->hw.hfcD.mst_m); break; @@ -6456,7 +6456,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.c default: if (cs->debug & L1_DEB_WARN) debugl1(cs, "hfcd_l1hw unknown pr %4x", pr); -@@ -1106,6 +1143,20 @@ +@@ -1106,6 +1143,20 @@ setstack_hfcd(struct PStack *st, struct static void hfc_dbusy_timer(struct IsdnCardState *cs) { @@ -6479,8 +6479,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.c 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 2007-12-15 05:19:39.938697014 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.h 2007-12-15 05:19:55.559587200 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_2bds0.h ++++ linux-2.4.35.4/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 $ @@ -6489,8 +6489,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bds0.h * Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bs0.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_2bs0.c 2007-12-15 05:19:39.946697472 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_2bs0.c 2007-12-15 05:19:55.559587200 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_2bs0.c ++++ linux-2.4.35.4/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 $ @@ -6499,8 +6499,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bs0.c * Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bs0.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_2bs0.h 2007-12-15 05:19:39.954697927 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_2bs0.h 2007-12-15 05:19:55.563587427 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_2bs0.h ++++ linux-2.4.35.4/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 $ @@ -6509,8 +6509,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_2bs0.h * Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_pci.c 2007-12-15 05:19:39.958698154 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.c 2007-12-15 05:19:55.567587653 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_pci.c ++++ linux-2.4.35.4/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 $ @@ -6531,7 +6531,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.c /* table entry in the PCI devices list */ typedef struct { -@@ -76,8 +77,6 @@ +@@ -76,8 +77,6 @@ release_io_hfcpci(struct IsdnCardState * { unsigned long flags; @@ -6540,7 +6540,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.c save_flags(flags); cli(); cs->hw.hfcpci.int_m2 = 0; /* interrupt output off ! */ -@@ -88,11 +87,13 @@ +@@ -88,11 +87,13 @@ release_io_hfcpci(struct IsdnCardState * set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout((30 * HZ) / 1000); /* Timeout 30ms */ Write_hfc(cs, HFCPCI_CIRM, 0); /* Reset Off */ @@ -6555,7 +6555,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.c } /********************************************************************************/ -@@ -687,10 +688,6 @@ +@@ -687,10 +688,6 @@ hfcpci_fill_fifo(struct BCState *bcs) debugl1(cs, "hfcpci_fill_fifo_trans %d frame length %d discarded", bcs->channel, bcs->tx_skb->len); @@ -6566,7 +6566,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.c dev_kfree_skb_any(bcs->tx_skb); cli(); bcs->tx_skb = skb_dequeue(&bcs->squeue); /* fetch next data */ -@@ -1146,6 +1143,20 @@ +@@ -1146,6 +1143,20 @@ hfcpci_interrupt(int intno, void *dev_id static void hfcpci_dbusy_timer(struct IsdnCardState *cs) { @@ -6587,7 +6587,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.c } /*************************************/ -@@ -1550,6 +1561,17 @@ +@@ -1550,6 +1561,17 @@ hfcpci_bh(struct IsdnCardState *cs) */ if (!cs) return; @@ -6605,7 +6605,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.c if (test_and_clear_bit(D_L1STATECHANGE, &cs->event)) { if (!cs->hw.hfcpci.nt_mode) switch (cs->dc.hfcpci.ph_state) { -@@ -1712,7 +1734,7 @@ +@@ -1712,7 +1734,7 @@ setup_hfcpci(struct IsdnCard *card) if (pci_enable_device(tmp_hfcpci)) continue; pci_set_master(tmp_hfcpci); @@ -6614,7 +6614,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.c continue; else break; -@@ -1729,7 +1751,7 @@ +@@ -1729,7 +1751,7 @@ setup_hfcpci(struct IsdnCard *card) printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n"); return (0); } @@ -6623,7 +6623,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.c printk(KERN_INFO "HiSax: HFC-PCI card manufacturer: %s card name: %s\n", id_list[i].vendor_name, id_list[i].card_name); } else { printk(KERN_WARNING "HFC-PCI: No PCI card found\n"); -@@ -1746,7 +1768,7 @@ +@@ -1746,7 +1768,7 @@ setup_hfcpci(struct IsdnCard *card) printk(KERN_WARNING "HFC-PCI: Error allocating memory for FIFO!\n"); return 0; } @@ -6634,8 +6634,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.c 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 2007-12-15 05:19:39.966698612 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.h 2007-12-15 05:19:55.571587882 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_pci.h ++++ linux-2.4.35.4/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 $ @@ -6644,8 +6644,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_pci.h * Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_sx.c 2007-12-15 05:19:39.974699067 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.c 2007-12-15 05:19:55.571587882 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_sx.c ++++ linux-2.4.35.4/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 $ @@ -6665,7 +6665,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.c /***************************************/ /* IRQ-table for CCDs demo board */ -@@ -940,6 +939,20 @@ +@@ -940,6 +939,20 @@ hfcsx_interrupt(int intno, void *dev_id, static void hfcsx_dbusy_timer(struct IsdnCardState *cs) { @@ -6686,7 +6686,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.c } /*************************************/ -@@ -1333,6 +1346,17 @@ +@@ -1333,6 +1346,17 @@ hfcsx_bh(struct IsdnCardState *cs) */ if (!cs) return; @@ -6704,7 +6704,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.c if (test_and_clear_bit(D_L1STATECHANGE, &cs->event)) { if (!cs->hw.hfcsx.nt_mode) switch (cs->dc.hfcsx.ph_state) { -@@ -1461,17 +1485,7 @@ +@@ -1461,17 +1485,7 @@ hfcsx_card_msg(struct IsdnCardState *cs, return (0); } @@ -6722,7 +6722,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.c int __devinit setup_hfcsx(struct IsdnCard *card) -@@ -1482,45 +1496,6 @@ +@@ -1482,45 +1496,6 @@ setup_hfcsx(struct IsdnCard *card) strcpy(tmp, hfcsx_revision); printk(KERN_INFO "HiSax: HFC-SX driver Rev. %s\n", HiSax_getrev(tmp)); @@ -6768,7 +6768,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.c cs->hw.hfcsx.base = card->para[1] & 0xfffe; cs->irq = card->para[0]; cs->hw.hfcsx.int_s1 = 0; -@@ -1603,3 +1578,7 @@ +@@ -1603,3 +1578,7 @@ setup_hfcsx(struct IsdnCard *card) cs->auxcmd = &hfcsx_auxcmd; return (1); } @@ -6778,8 +6778,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.c + Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_sx.h 2007-12-15 05:19:39.982699522 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.h 2007-12-15 05:19:55.571587882 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_sx.h ++++ linux-2.4.35.4/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$ @@ -6788,8 +6788,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_sx.h * Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c 2007-12-15 05:19:55.575588111 +0100 +--- /dev/null ++++ linux-2.4.35.4/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 $ + * @@ -7982,8 +7982,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c +module_exit(hfc_usb_exit); Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usbr.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_usbr.c 2007-12-15 05:19:55.575588111 +0100 +--- /dev/null ++++ linux-2.4.35.4/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 $ + @@ -8458,8 +8458,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usbr.c +} Index: linux-2.4.35.4/drivers/isdn/hisax/hfcscard.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfcscard.c 2007-12-15 05:19:39.998700433 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hfcscard.c 2007-12-15 05:19:55.575588111 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfcscard.c ++++ linux-2.4.35.4/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 $ @@ -8482,7 +8482,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfcscard.c static void hfcs_interrupt(int intno, void *dev_id, struct pt_regs *regs) -@@ -140,36 +139,6 @@ +@@ -140,36 +139,6 @@ hfcs_card_msg(struct IsdnCardState *cs, return(0); } @@ -8519,7 +8519,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfcscard.c int __init setup_hfcs(struct IsdnCard *card) { -@@ -178,46 +147,6 @@ +@@ -178,46 +147,6 @@ setup_hfcs(struct IsdnCard *card) strcpy(tmp, hfcs_revision); printk(KERN_INFO "HiSax: HFC-S driver Rev. %s\n", HiSax_getrev(tmp)); @@ -8568,8 +8568,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfcscard.c 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 2007-12-15 05:19:40.006700891 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hisax.h 2007-12-15 05:19:55.579588340 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax.h ++++ linux-2.4.35.4/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 $ @@ -8596,7 +8596,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax.h #define MDL_ASSIGN 0x0280 #define MDL_REMOVE 0x0284 #define MDL_ERROR 0x0288 -@@ -472,8 +471,6 @@ +@@ -472,8 +471,6 @@ struct amd7930_hw { #define BC_FLG_FTI_RUN 13 #define BC_FLG_LL_OK 14 #define BC_FLG_LL_CONN 15 @@ -8605,7 +8605,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax.h #define L1_MODE_NULL 0 #define L1_MODE_TRANS 1 -@@ -695,6 +692,13 @@ +@@ -695,6 +692,13 @@ struct hfcPCI_hw { struct timer_list timer; }; @@ -8619,7 +8619,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax.h struct hfcSX_hw { unsigned long base; unsigned char cirm; -@@ -838,17 +842,6 @@ +@@ -838,17 +842,6 @@ struct w6692_chip { int ph_state; }; @@ -8637,7 +8637,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax.h struct icc_chip { int ph_state; u_char *mon_tx; -@@ -902,6 +895,9 @@ +@@ -902,6 +895,9 @@ struct IsdnCardState { struct njet_hw njet; struct hfcD_hw hfcD; struct hfcPCI_hw hfcpci; @@ -8647,7 +8647,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax.h struct hfcSX_hw hfcsx; struct ix1_hw niccy; struct isurf_hw isurf; -@@ -945,7 +941,6 @@ +@@ -945,7 +941,6 @@ struct IsdnCardState { struct hfcpci_chip hfcpci; struct hfcsx_chip hfcsx; struct w6692_chip w6692; @@ -8655,7 +8655,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax.h struct icc_chip icc; } dc; u_char *rcvbuf; -@@ -967,6 +962,8 @@ +@@ -967,6 +962,8 @@ struct IsdnCardState { #define MON0_TX 4 #define MON1_TX 8 @@ -8664,7 +8664,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax.h #define ISDN_CTYPE_16_0 1 #define ISDN_CTYPE_8_0 2 #define ISDN_CTYPE_16_3 3 -@@ -1006,8 +1003,8 @@ +@@ -1006,8 +1003,8 @@ struct IsdnCardState { #define ISDN_CTYPE_HFC_SX 37 #define ISDN_CTYPE_NETJET_U 38 #define ISDN_CTYPE_HFC_SP_PCMCIA 39 @@ -8675,7 +8675,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax.h #define ISDN_CTYPE_COUNT 41 -@@ -1267,10 +1264,6 @@ +@@ -1267,10 +1264,6 @@ struct IsdnCardState { #define CARD_NETJET_U 0 #endif @@ -8688,8 +8688,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax.h /* 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 2007-12-15 05:19:40.014701347 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_debug.h 2007-12-15 05:19:55.579588340 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_debug.h ++++ linux-2.4.35.4/drivers/isdn/hisax/hisax_debug.h @@ -28,7 +28,7 @@ #define DBG(level, format, arg...) do { \ @@ -8701,8 +8701,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_debug.h #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 2007-12-15 05:19:40.018701573 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c 2007-12-15 05:19:55.579588340 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_fcpcipnp.c ++++ linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c @@ -20,22 +20,19 @@ * * o POWER PC @@ -8728,7 +8728,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c // debugging cruft #define __debug_variable debug -@@ -46,10 +43,14 @@ +@@ -46,10 +43,14 @@ static int debug = 0; MODULE_PARM(debug, "i"); #endif @@ -8745,7 +8745,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c { PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1 , PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) "Fritz!Card PCI" }, { PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1_V2, PCI_ANY_ID, PCI_ANY_ID, -@@ -58,7 +59,7 @@ +@@ -58,7 +59,7 @@ static struct pci_device_id fcpci_ids[] }; MODULE_DEVICE_TABLE(pci, fcpci_ids); @@ -8754,7 +8754,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c { ISAPNP_VENDOR('A', 'V', 'M'), ISAPNP_FUNCTION(0x0900), ISAPNP_VENDOR('A', 'V', 'M'), ISAPNP_FUNCTION(0x0900), (unsigned long) "Fritz!Card PnP" }, -@@ -68,7 +69,8 @@ +@@ -68,7 +69,8 @@ MODULE_DEVICE_TABLE(isapnp, fcpnp_ids); static int protocol = 2; /* EURO-ISDN Default */ MODULE_PARM(protocol, "i"); @@ -8764,7 +8764,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c // ---------------------------------------------------------------------- -@@ -147,7 +149,7 @@ +@@ -147,7 +149,7 @@ static unsigned char fcpci_read_isac(str outb(idx, adapter->io + AVM_INDEX); val = inb(adapter->io + AVM_DATA + (offset & 0xf)); spin_unlock_irqrestore(&adapter->hw_lock, flags); @@ -8773,7 +8773,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c offset, val); return val; } -@@ -160,7 +162,7 @@ +@@ -160,7 +162,7 @@ static void fcpci_write_isac(struct isac AVM_IDX_ISAC_REG_HIGH : AVM_IDX_ISAC_REG_LOW; unsigned long flags; @@ -8782,7 +8782,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c offset, value); spin_lock_irqsave(&adapter->hw_lock, flags); outb(idx, adapter->io + AVM_INDEX); -@@ -240,7 +242,7 @@ +@@ -240,7 +242,7 @@ static unsigned char fcpci2_read_isac(st outl(offset, adapter->io + AVM_ISACSX_INDEX); val = inl(adapter->io + AVM_ISACSX_DATA); spin_unlock_irqrestore(&adapter->hw_lock, flags); @@ -8791,7 +8791,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c offset, val); return val; -@@ -252,7 +254,7 @@ +@@ -252,7 +254,7 @@ static void fcpci2_write_isac(struct isa struct fritz_adapter *adapter = isac->priv; unsigned long flags; @@ -8800,7 +8800,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c offset, value); spin_lock_irqsave(&adapter->hw_lock, flags); outl(offset, adapter->io + AVM_ISACSX_INDEX); -@@ -375,6 +377,9 @@ +@@ -375,6 +377,9 @@ static void hdlc_fill_fifo(struct fritz_ DBG(0x40, "hdlc_fill_fifo"); @@ -8810,7 +8810,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c if (skb->len == 0) BUG(); -@@ -515,7 +520,6 @@ +@@ -515,7 +520,6 @@ static inline void hdlc_xdu_irq(struct f } skb_push(bcs->tx_skb, bcs->tx_cnt); bcs->tx_cnt = 0; @@ -8818,7 +8818,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c } static inline void hdlc_xpr_irq(struct fritz_bcs *bcs) -@@ -536,7 +540,7 @@ +@@ -536,7 +540,7 @@ static inline void hdlc_xpr_irq(struct f dev_kfree_skb_irq(skb); } @@ -8827,7 +8827,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c { DBG(0x10, "ch%d stat %#x", bcs->channel, stat); if (stat & HDLC_INT_RPR) { -@@ -553,7 +557,7 @@ +@@ -553,7 +557,7 @@ static void hdlc_irq_one(struct fritz_bc } } @@ -8836,7 +8836,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c { int nr; u32 stat; -@@ -562,7 +566,7 @@ +@@ -562,7 +566,7 @@ static inline void hdlc_irq(struct fritz stat = adapter->read_hdlc_status(adapter, nr); DBG(0x10, "HDLC %c stat %#x", 'A' + nr, stat); if (stat & HDLC_INT_MASK) @@ -8845,7 +8845,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c } } -@@ -584,14 +588,14 @@ +@@ -584,14 +588,14 @@ static void modehdlc(struct fritz_bcs *b adapter->write_ctrl(bcs, 5); break; case L1_MODE_TRANS: @@ -8867,7 +8867,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c adapter->write_ctrl(bcs, 5); bcs->ctrl.sr.cmd = HDLC_CMD_XRS; adapter->write_ctrl(bcs, 1); -@@ -645,10 +649,10 @@ +@@ -645,10 +649,10 @@ static void fcpci2_irq(int intno, void * return; DBG(2, "STATUS0 %#x", val); if (val & AVM_STATUS0_IRQ_ISAC) @@ -8880,7 +8880,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c } static void fcpci_irq(int intno, void *dev, struct pt_regs *regs) -@@ -662,10 +666,10 @@ +@@ -662,10 +666,10 @@ static void fcpci_irq(int intno, void *d return; DBG(2, "sval %#x", sval); if (!(sval & AVM_STATUS0_IRQ_ISAC)) @@ -8893,7 +8893,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c } // ---------------------------------------------------------------------- -@@ -681,11 +685,6 @@ +@@ -681,11 +685,6 @@ static inline void fcpci_init(struct fri { outb(AVM_STATUS0_DIS_TIMER | AVM_STATUS0_RES_TIMER | AVM_STATUS0_ENA_IRQ, adapter->io + AVM_STATUS0); @@ -8905,7 +8905,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c } // ---------------------------------------------------------------------- -@@ -693,6 +692,7 @@ +@@ -693,6 +692,7 @@ static inline void fcpci_init(struct fri static int __devinit fcpcipnp_setup(struct fritz_adapter *adapter) { u32 val = 0; @@ -8913,7 +8913,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c int retval; DBG(1,""); -@@ -700,21 +700,21 @@ +@@ -700,21 +700,21 @@ static int __devinit fcpcipnp_setup(stru isac_init(&adapter->isac); // FIXME is this okay now retval = -EBUSY; @@ -8942,7 +8942,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c break; } if (retval) -@@ -808,11 +808,23 @@ +@@ -808,11 +808,23 @@ static int __devinit fcpcipnp_setup(stru static void __devexit fcpcipnp_release(struct fritz_adapter *adapter) { @@ -8967,7 +8967,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c } // ---------------------------------------------------------------------- -@@ -830,6 +842,8 @@ +@@ -830,6 +842,8 @@ new_adapter(struct pci_dev *pdev) memset(adapter, 0, sizeof(struct fritz_adapter)); @@ -8976,7 +8976,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c SET_MODULE_OWNER(&adapter->isac.hisax_d_if); adapter->isac.hisax_d_if.ifc.priv = &adapter->isac; adapter->isac.hisax_d_if.ifc.l2l1 = isac_d_l2l1; -@@ -840,6 +854,7 @@ +@@ -840,6 +854,7 @@ new_adapter(struct pci_dev *pdev) adapter->bcs[i].b_if.ifc.priv = &adapter->bcs[i]; adapter->bcs[i].b_if.ifc.l2l1 = fritz_b_l2l1; } @@ -8984,7 +8984,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c pci_set_drvdata(pdev, adapter); -@@ -854,6 +869,7 @@ +@@ -854,6 +869,7 @@ new_adapter(struct pci_dev *pdev) static void delete_adapter(struct fritz_adapter *adapter) { hisax_unregister(&adapter->isac.hisax_d_if); @@ -8992,7 +8992,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c kfree(adapter); } -@@ -863,12 +879,15 @@ +@@ -863,12 +879,15 @@ static int __devinit fcpci_probe(struct struct fritz_adapter *adapter; int retval; @@ -9009,7 +9009,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c adapter->type = AVM_FRITZ_PCIV2; else adapter->type = AVM_FRITZ_PCI; -@@ -876,12 +895,7 @@ +@@ -876,12 +895,7 @@ static int __devinit fcpci_probe(struct retval = pci_enable_device(pdev); if (retval) goto err_free; @@ -9022,7 +9022,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c retval = fcpcipnp_setup(adapter); if (retval) -@@ -901,6 +915,9 @@ +@@ -901,6 +915,9 @@ static int __devinit fcpnp_probe(struct struct fritz_adapter *adapter; int retval; @@ -9032,7 +9032,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c retval = -ENOMEM; adapter = new_adapter(pdev); if (!adapter) -@@ -912,11 +929,8 @@ +@@ -912,11 +929,8 @@ static int __devinit fcpnp_probe(struct pdev->deactivate(pdev); // why? pdev->activate(pdev); adapter->io = pdev->resource[0].start; @@ -9046,7 +9046,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c retval = fcpcipnp_setup(adapter); if (retval) goto err_free; -@@ -929,43 +943,35 @@ +@@ -929,43 +943,35 @@ static int __devinit fcpnp_probe(struct return retval; } @@ -9101,7 +9101,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c retval = pci_register_driver(&fcpci_driver); if (retval < 0) -@@ -976,15 +982,14 @@ +@@ -976,15 +982,14 @@ static int __init hisax_fcpcipnp_init(vo if (retval < 0) goto out_unregister_pci; @@ -9119,7 +9119,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.c out_unregister_isapnp: isapnp_unregister_driver(&fcpnp_driver); #endif -@@ -994,11 +999,15 @@ +@@ -994,11 +999,15 @@ static int __init hisax_fcpcipnp_init(vo return retval; } @@ -9140,9 +9140,9 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.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 2007-12-15 05:19:40.026702031 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.h 2007-12-15 05:19:55.579588340 +0100 -@@ -43,10 +43,12 @@ +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_fcpcipnp.h ++++ linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.h +@@ -43,10 +43,12 @@ struct fritz_bcs { }; struct fritz_adapter { @@ -9158,8 +9158,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_fcpcipnp.h 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 2007-12-15 05:19:40.034702487 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c 2007-12-15 05:19:55.583588567 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_isac.c ++++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c @@ -34,7 +34,7 @@ static int debug = 1; MODULE_PARM(debug, "i"); @@ -9169,7 +9169,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c "2086/2186 V1.1", "2085 B1", "2085 B2", -@@ -42,10 +42,6 @@ +@@ -42,10 +42,6 @@ static char *ISACVer[] = { }; #endif @@ -9180,7 +9180,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c #define DBG_WARN 0x0001 #define DBG_IRQ 0x0002 #define DBG_L1M 0x0004 -@@ -438,7 +434,7 @@ +@@ -438,7 +434,7 @@ static void l1m_debug(struct FsmInst *fi va_end(args); } @@ -9189,7 +9189,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c { int val; -@@ -602,7 +598,7 @@ +@@ -602,7 +598,7 @@ static inline void isac_exi_interrupt(st } } @@ -9198,7 +9198,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c { unsigned char val; -@@ -635,8 +631,6 @@ +@@ -635,8 +631,6 @@ void isac_irq(struct isac *isac) if (val & ISAC_ISTA_SIN) { DBG(DBG_WARN, "SIN"); } @@ -9207,7 +9207,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c } // ====================================================================== -@@ -742,7 +736,7 @@ +@@ -742,7 +736,7 @@ static inline void isacsx_icd_interrupt( } } @@ -9216,7 +9216,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c { unsigned char val; -@@ -755,7 +749,7 @@ +@@ -755,7 +749,7 @@ void isacsx_irq(struct isac *isac) isacsx_cic_interrupt(isac); } @@ -9225,7 +9225,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c { isac->tx_skb = NULL; isac->l1m.fsm = &l1fsm; -@@ -770,7 +764,7 @@ +@@ -770,7 +764,7 @@ void isac_init(struct isac *isac) FsmInitTimer(&isac->l1m, &isac->timer); } @@ -9234,7 +9234,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c { int val, eval; -@@ -781,7 +775,7 @@ +@@ -781,7 +775,7 @@ void isac_setup(struct isac *isac) isac->write_isac(isac, ISAC_MASK, 0xff); isac->mocr = 0xaa; @@ -9243,7 +9243,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c /* IOM 1 Mode */ isac->write_isac(isac, ISAC_ADF2, 0x0); isac->write_isac(isac, ISAC_SPCR, 0xa); -@@ -817,7 +811,7 @@ +@@ -817,7 +811,7 @@ void isac_setup(struct isac *isac) FsmEvent(&isac->l1m, (val >> 2) & 0xf, NULL); isac->write_isac(isac, ISAC_MASK, 0x0); @@ -9252,7 +9252,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c isac->write_isac(isac, ISAC_CMDR, ISAC_CMDR_XRES | ISAC_CMDR_RRES); } -@@ -888,10 +882,10 @@ +@@ -888,10 +882,10 @@ EXPORT_SYMBOL(isac_init); EXPORT_SYMBOL(isac_d_l2l1); EXPORT_SYMBOL(isacsx_setup); @@ -9267,8 +9267,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.c 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 2007-12-15 05:19:40.042702942 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.h 2007-12-15 05:19:55.583588567 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hisax_isac.h ++++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.h @@ -8,7 +8,7 @@ #define TIMER3_VALUE 7000 #define MAX_DFRAME_LEN_L1 300 @@ -9278,7 +9278,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.h struct isac { void *priv; -@@ -37,9 +37,9 @@ +@@ -37,9 +37,9 @@ void isac_init(struct isac *isac); void isac_d_l2l1(struct hisax_if *hisax_d_if, int pr, void *arg); void isac_setup(struct isac *isac); @@ -9292,8 +9292,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isac.h #endif Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.c 2007-12-15 05:19:55.583588567 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.c @@ -0,0 +1,105 @@ +// FIXME copied +static const struct isapnp_device_id * @@ -9402,8 +9402,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.c + Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.h 2007-12-15 05:19:55.583588567 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.h @@ -0,0 +1,33 @@ +#ifndef __HISAX_ISAPNP_H__ +#define __HISAX_ISAPNP_H__ @@ -9440,8 +9440,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_isapnp.h +#endif Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_loadable.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/isdn/hisax/hisax_loadable.h 2007-12-15 05:19:55.583588567 +0100 +--- /dev/null ++++ linux-2.4.35.4/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 $ + * @@ -9519,8 +9519,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hisax_loadable.h +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 2007-12-15 05:19:40.066704311 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hscx.c 2007-12-15 05:19:55.583588567 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hscx.c ++++ linux-2.4.35.4/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 $ @@ -9529,8 +9529,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hscx.c * Index: linux-2.4.35.4/drivers/isdn/hisax/hscx.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hscx.h 2007-12-15 05:19:40.070704537 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hscx.h 2007-12-15 05:19:55.587588793 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hscx.h ++++ linux-2.4.35.4/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 $ @@ -9539,8 +9539,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hscx.h * Index: linux-2.4.35.4/drivers/isdn/hisax/hscx_irq.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hscx_irq.c 2007-12-15 05:19:40.078704992 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hscx_irq.c 2007-12-15 05:19:55.587588793 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hscx_irq.c ++++ linux-2.4.35.4/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 $ @@ -9549,8 +9549,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hscx_irq.c * Index: linux-2.4.35.4/drivers/isdn/hisax/icc.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/icc.c 2007-12-15 05:19:40.086705450 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/icc.c 2007-12-15 05:19:55.587588793 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/icc.c ++++ linux-2.4.35.4/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 $ @@ -9559,8 +9559,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/icc.c * Index: linux-2.4.35.4/drivers/isdn/hisax/icc.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/icc.h 2007-12-15 05:19:40.094705906 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/icc.h 2007-12-15 05:19:55.587588793 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/icc.h ++++ linux-2.4.35.4/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 $ @@ -9569,8 +9569,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/icc.h * Index: linux-2.4.35.4/drivers/isdn/hisax/ipac.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/ipac.h 2007-12-15 05:19:40.098706132 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/ipac.h 2007-12-15 05:19:55.587588793 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/ipac.h ++++ linux-2.4.35.4/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 $ @@ -9579,8 +9579,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/ipac.h * Index: linux-2.4.35.4/drivers/isdn/hisax/isac.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/isac.c 2007-12-15 05:19:40.106706590 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/isac.c 2007-12-15 05:19:55.591589021 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/isac.c ++++ linux-2.4.35.4/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 $ @@ -9589,8 +9589,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isac.c * Index: linux-2.4.35.4/drivers/isdn/hisax/isac.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/isac.h 2007-12-15 05:19:40.118707272 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/isac.h 2007-12-15 05:19:55.591589021 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/isac.h ++++ linux-2.4.35.4/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 $ @@ -9599,8 +9599,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isac.h * Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/isar.c 2007-12-15 05:19:40.130707956 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/isar.c 2007-12-15 05:19:55.595589250 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/isar.c ++++ linux-2.4.35.4/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 $ @@ -9624,7 +9624,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c void isar_setup(struct IsdnCardState *cs); static void isar_pump_cmd(struct BCState *bcs, u_char cmd, u_char para); -@@ -127,7 +125,7 @@ +@@ -127,7 +125,7 @@ get_irq_infos(struct IsdnCardState *cs, ireg->clsb = cs->BC_Read_Reg(cs, 1, ISAR_CTRL_L); #if DUMP_MBOXFRAME if (cs->debug & L1_DEB_HSCX) @@ -9633,7 +9633,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c ireg->clsb); #endif } -@@ -414,7 +412,6 @@ +@@ -414,7 +412,6 @@ isar_load_firmware(struct IsdnCardState } cs->debug = debug; isar_setup(cs); @@ -9641,7 +9641,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c ret = 0; reterrflg: restore_flags(flags); -@@ -428,21 +425,6 @@ +@@ -428,21 +425,6 @@ reterror: return(ret); } @@ -9663,7 +9663,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c extern void BChannel_bh(struct BCState *); #define B_LL_NOCARRIER 8 #define B_LL_CONNECT 9 -@@ -599,6 +581,7 @@ +@@ -599,6 +581,7 @@ isar_rcv_frame(struct IsdnCardState *cs, if (ireg->cmsb & SART_NMD) { /* ABORT */ if (cs->debug & L1_DEB_WARN) debugl1(cs, "isar_rcv_frame: no more data"); @@ -9671,7 +9671,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c bcs->hw.isar.rcvidx = 0; send_DLE_ETX(bcs); sendmsg(cs, SET_DPS(bcs->hw.isar.dpath) | -@@ -609,6 +592,7 @@ +@@ -609,6 +592,7 @@ isar_rcv_frame(struct IsdnCardState *cs, } } else { printk(KERN_WARNING "HiSax: skb out of memory\n"); @@ -9679,7 +9679,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c } break; } -@@ -633,9 +617,8 @@ +@@ -633,9 +617,8 @@ isar_rcv_frame(struct IsdnCardState *cs, bcs->hw.isar.rcvidx = 0; cs->BC_Write_Reg(cs, 1, ISAR_IIA, 0); } else { @@ -9690,7 +9690,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c ptr = bcs->hw.isar.rcvbuf + bcs->hw.isar.rcvidx; bcs->hw.isar.rcvidx += ireg->clsb; rcv_mbox(cs, ireg, ptr); -@@ -646,8 +629,6 @@ +@@ -646,8 +629,6 @@ isar_rcv_frame(struct IsdnCardState *cs, if (cs->debug & L1_DEB_WARN) debugl1(cs, "isar frame to short %d", bcs->hw.isar.rcvidx); @@ -9699,7 +9699,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c } else if (!(skb = dev_alloc_skb(bcs->hw.isar.rcvidx))) { printk(KERN_WARNING "ISAR: receive out of memory\n"); } else { -@@ -658,7 +639,6 @@ +@@ -658,7 +639,6 @@ isar_rcv_frame(struct IsdnCardState *cs, isar_sched_event(bcs, B_RCVBUFREADY); send_DLE_ETX(bcs); isar_sched_event(bcs, B_LL_OK); @@ -9707,7 +9707,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c } bcs->hw.isar.rcvidx = 0; } -@@ -666,14 +646,13 @@ +@@ -666,14 +646,13 @@ isar_rcv_frame(struct IsdnCardState *cs, if (ireg->cmsb & SART_NMD) { /* ABORT */ if (cs->debug & L1_DEB_WARN) debugl1(cs, "isar_rcv_frame: no more data"); @@ -9725,7 +9725,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c } break; default: -@@ -977,6 +956,21 @@ +@@ -977,6 +956,21 @@ isar_pump_statev_modem(struct BCState *b } } @@ -9747,7 +9747,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c static void isar_pump_statev_fax(struct BCState *bcs, u_char devt) { struct IsdnCardState *cs = bcs->cs; -@@ -1081,22 +1075,19 @@ +@@ -1081,22 +1075,19 @@ isar_pump_statev_fax(struct BCState *bcs if (cs->debug & L1_DEB_HSCX) debugl1(cs, "pump stev RSP_DISC"); if (bcs->hw.isar.state == STFAX_ESCAPE) { @@ -9773,7 +9773,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c p1 = bcs->hw.isar.mod = bcs->hw.isar.newmod; bcs->hw.isar.newmod = 0; bcs->hw.isar.cmd = bcs->hw.isar.newcmd; -@@ -1215,9 +1206,6 @@ +@@ -1215,9 +1206,6 @@ isar_int_main(struct IsdnCardState *cs) isar_pump_statev_modem(bcs, ireg->cmsb); } else if (bcs->mode == L1_MODE_FAX) { isar_pump_statev_fax(bcs, ireg->cmsb); @@ -9783,7 +9783,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c } else { if (cs->debug & L1_DEB_WARN) debugl1(cs, "isar IIS_PSTEV pmode %d stat %x", -@@ -1278,9 +1266,6 @@ +@@ -1278,9 +1266,6 @@ ftimer_handler(struct BCState *bcs) { if (test_and_clear_bit(BC_FLG_LL_CONN, &bcs->Flag)) { isar_sched_event(bcs, B_LL_CONNECT); } @@ -9793,7 +9793,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c } static void -@@ -1303,7 +1288,7 @@ +@@ -1303,7 +1288,7 @@ setup_pump(struct BCState *bcs) { } else { param[5] = PV32P6_ATN; } @@ -9802,7 +9802,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c param[1] = PV32P2_V23R | PV32P2_V22A | PV32P2_V22B | PV32P2_V22C | PV32P2_V21 | PV32P2_BEL; param[2] = PV32P3_AMOD | PV32P3_V32B | PV32P3_V23B; -@@ -1319,7 +1304,7 @@ +@@ -1319,7 +1304,7 @@ setup_pump(struct BCState *bcs) { } else { param[1] = PFAXP2_ATN; } @@ -9811,7 +9811,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c sendmsg(cs, dps | ISAR_HIS_PUMPCFG, ctrl, 2, param); bcs->hw.isar.state = STFAX_NULL; bcs->hw.isar.newcmd = 0; -@@ -1348,6 +1333,7 @@ +@@ -1348,6 +1333,7 @@ setup_sart(struct BCState *bcs) { "\0\0"); break; case L1_MODE_HDLC: @@ -9819,7 +9819,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c param[0] = 0; sendmsg(cs, dps | ISAR_HIS_SARTCFG, SMODE_HDLC, 1, param); -@@ -1359,9 +1345,6 @@ +@@ -1359,9 +1345,6 @@ setup_sart(struct BCState *bcs) { sendmsg(cs, dps | ISAR_HIS_SARTCFG, ctrl, 2, param); break; @@ -9829,7 +9829,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c } udelay(1000); sendmsg(cs, dps | ISAR_HIS_BSTREQ, 0, 0, NULL); -@@ -1465,7 +1448,6 @@ +@@ -1465,7 +1448,6 @@ isar_pump_cmd(struct BCState *bcs, u_cha switch(cmd) { case ISDN_FAX_CLASS1_FTM: @@ -9837,7 +9837,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c if (bcs->hw.isar.state == STFAX_READY) { p1 = para; ctrl = PCTRL_CMD_FTM; -@@ -1489,7 +1471,6 @@ +@@ -1489,7 +1471,6 @@ isar_pump_cmd(struct BCState *bcs, u_cha } break; case ISDN_FAX_CLASS1_FTH: @@ -9845,7 +9845,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c if (bcs->hw.isar.state == STFAX_READY) { p1 = para; ctrl = PCTRL_CMD_FTH; -@@ -1513,7 +1494,6 @@ +@@ -1513,7 +1494,6 @@ isar_pump_cmd(struct BCState *bcs, u_cha } break; case ISDN_FAX_CLASS1_FRM: @@ -9853,7 +9853,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c if (bcs->hw.isar.state == STFAX_READY) { p1 = para; ctrl = PCTRL_CMD_FRM; -@@ -1537,7 +1517,6 @@ +@@ -1537,7 +1517,6 @@ isar_pump_cmd(struct BCState *bcs, u_cha } break; case ISDN_FAX_CLASS1_FRH: @@ -9861,7 +9861,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c if (bcs->hw.isar.state == STFAX_READY) { p1 = para; ctrl = PCTRL_CMD_FRH; -@@ -1560,11 +1539,6 @@ +@@ -1560,11 +1539,6 @@ isar_pump_cmd(struct BCState *bcs, u_cha bcs->hw.isar.state = STFAX_ESCAPE; } break; @@ -9873,7 +9873,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c } if (ctrl) sendmsg(cs, dps | ISAR_HIS_PUMPCTRL, ctrl, nom, &p1); -@@ -1658,15 +1632,6 @@ +@@ -1658,15 +1632,6 @@ isar_l2l1(struct PStack *st, int pr, voi l1_msg_b(st, pr, arg); break; case (PH_DEACTIVATE | CONFIRM): @@ -9889,7 +9889,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c test_and_clear_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); test_and_clear_bit(BC_FLG_BUSY, &st->l1.bcs->Flag); if (st->l1.bcs->cs->debug & L1_DEB_HSCX) -@@ -1758,51 +1723,6 @@ +@@ -1758,51 +1723,6 @@ isar_auxcmd(struct IsdnCardState *cs, is test_and_set_bit(BC_FLG_DLEETX, &bcs->Flag); break; @@ -9941,7 +9941,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c case ISDN_FAX_CLASS1_FRM: case ISDN_FAX_CLASS1_FRH: case ISDN_FAX_CLASS1_FTM: -@@ -1815,24 +1735,16 @@ +@@ -1815,24 +1735,16 @@ isar_auxcmd(struct IsdnCardState *cs, is cs->iif.statcallb(ic); return(0); } else if (ic->parm.aux.subcmd == AT_EQ_QUERY) { @@ -9968,7 +9968,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c test_bit(BC_FLG_INIT, &bcs->Flag)) { isar_pump_cmd(bcs, ic->parm.aux.cmd, -@@ -1850,7 +1762,7 @@ +@@ -1850,7 +1762,7 @@ isar_auxcmd(struct IsdnCardState *cs, is break; case (ISDN_CMD_IOCTL): switch (ic->arg) { @@ -9977,7 +9977,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c features = ISDN_FEATURE_L2_MODEM | ISDN_FEATURE_L2_FAX | ISDN_FEATURE_L3_FCLASS1; -@@ -1860,26 +1772,6 @@ +@@ -1860,26 +1772,6 @@ isar_auxcmd(struct IsdnCardState *cs, is else ll_run(cs, features); break; @@ -10006,8 +10006,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.c (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 2007-12-15 05:19:40.138708412 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/isar.h 2007-12-15 05:19:55.615590390 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/isar.h ++++ linux-2.4.35.4/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 $ @@ -10045,8 +10045,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isar.h 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 2007-12-15 05:19:40.150709096 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/isdnl1.c 2007-12-15 05:19:55.615590390 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl1.c ++++ linux-2.4.35.4/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 $ @@ -10064,8 +10064,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl1.c #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 2007-12-15 05:19:40.154709325 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/isdnl1.h 2007-12-15 05:19:55.619590620 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl1.h ++++ linux-2.4.35.4/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 $ @@ -10074,8 +10074,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl1.h * Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl2.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl2.c 2007-12-15 05:19:40.162709781 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/isdnl2.c 2007-12-15 05:19:55.619590620 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl2.c ++++ linux-2.4.35.4/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 $ @@ -10091,7 +10091,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl2.c static void l2m_debug(struct FsmInst *fi, char *fmt, ...); -@@ -1418,8 +1418,8 @@ +@@ -1418,8 +1418,8 @@ l2_st5_tei_remove(struct FsmInst *fi, in freewin(st); st->l2.tei = -1; stop_t200(st, 17); @@ -10103,8 +10103,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl2.c static void Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl2.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl2.h 2007-12-15 05:19:40.170710236 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/isdnl2.h 2007-12-15 05:19:55.619590620 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl2.h ++++ linux-2.4.35.4/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$ @@ -10113,8 +10113,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl2.h * Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl3.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl3.c 2007-12-15 05:19:40.178710691 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/isdnl3.c 2007-12-15 05:19:55.619590620 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl3.c ++++ linux-2.4.35.4/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 $ @@ -10132,8 +10132,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl3.c Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl3.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl3.h 2007-12-15 05:19:40.182710920 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/isdnl3.h 2007-12-15 05:19:55.623590846 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/isdnl3.h ++++ linux-2.4.35.4/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$ @@ -10142,8 +10142,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isdnl3.h * 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 2007-12-15 05:19:40.190711376 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/isurf.c 2007-12-15 05:19:55.623590846 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/isurf.c ++++ linux-2.4.35.4/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 $ @@ -10163,7 +10163,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isurf.c #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) -@@ -128,8 +127,10 @@ +@@ -128,8 +127,10 @@ void release_io_isurf(struct IsdnCardState *cs) { release_region(cs->hw.isurf.reset, 1); @@ -10174,7 +10174,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isurf.c } static void -@@ -194,10 +195,6 @@ +@@ -194,10 +195,6 @@ isurf_auxcmd(struct IsdnCardState *cs, i return(isar_auxcmd(cs, ic)); } @@ -10185,7 +10185,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isurf.c int __init setup_isurf(struct IsdnCard *card) { -@@ -215,58 +212,9 @@ +@@ -215,58 +212,9 @@ setup_isurf(struct IsdnCard *card) cs->hw.isurf.phymem = card->para[2]; cs->irq = card->para[0]; } else { @@ -10244,7 +10244,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isurf.c } if (check_region(cs->hw.isurf.reset, 1)) { printk(KERN_WARNING -@@ -277,6 +225,7 @@ +@@ -277,6 +225,7 @@ setup_isurf(struct IsdnCard *card) } else { request_region(cs->hw.isurf.reset, 1, "isurf isdn"); } @@ -10252,7 +10252,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isurf.c if (check_mem_region(cs->hw.isurf.phymem, ISURF_IOMEM_SIZE)) { printk(KERN_WARNING "HiSax: %s memory region %lx-%lx already in use\n", -@@ -292,6 +241,10 @@ +@@ -292,6 +241,10 @@ setup_isurf(struct IsdnCard *card) cs->hw.isurf.isar = (unsigned long) ioremap(cs->hw.isurf.phymem, ISURF_IOMEM_SIZE); cs->hw.isurf.isac = cs->hw.isurf.isar + ISURF_ISAC_OFFSET; @@ -10265,8 +10265,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/isurf.c 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 2007-12-15 05:19:40.198711831 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/ix1_micro.c 2007-12-15 05:19:55.623590846 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/ix1_micro.c ++++ linux-2.4.35.4/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 $ @@ -10289,7 +10289,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/ix1_micro.c #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) -@@ -219,21 +218,6 @@ +@@ -219,21 +218,6 @@ ix1_card_msg(struct IsdnCardState *cs, i return(0); } @@ -10311,7 +10311,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/ix1_micro.c int __init setup_ix1micro(struct IsdnCard *card) -@@ -246,45 +230,6 @@ +@@ -246,45 +230,6 @@ setup_ix1micro(struct IsdnCard *card) if (cs->typ != ISDN_CTYPE_IX1MICROR2) return (0); @@ -10359,8 +10359,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/ix1_micro.c 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 2007-12-15 05:19:40.206712289 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/jade.c 2007-12-15 05:19:55.623590846 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/jade.c ++++ linux-2.4.35.4/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 $ @@ -10369,8 +10369,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/jade.c * Index: linux-2.4.35.4/drivers/isdn/hisax/jade.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/jade.h 2007-12-15 05:19:40.214712745 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/jade.h 2007-12-15 05:19:55.623590846 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/jade.h ++++ linux-2.4.35.4/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 $ @@ -10379,8 +10379,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/jade.h * Index: linux-2.4.35.4/drivers/isdn/hisax/jade_irq.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/jade_irq.c 2007-12-15 05:19:40.218712971 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/jade_irq.c 2007-12-15 05:19:55.627591072 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/jade_irq.c ++++ linux-2.4.35.4/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 $ @@ -10389,8 +10389,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/jade_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 2007-12-15 05:19:40.226713429 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/l3_1tr6.c 2007-12-15 05:19:55.627591072 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/l3_1tr6.c ++++ linux-2.4.35.4/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 $ @@ -10408,8 +10408,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/l3_1tr6.c *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 2007-12-15 05:19:40.234713885 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/l3_1tr6.h 2007-12-15 05:19:55.627591072 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/l3_1tr6.h ++++ linux-2.4.35.4/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$ @@ -10418,8 +10418,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/l3_1tr6.h * Index: linux-2.4.35.4/drivers/isdn/hisax/l3dss1.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/l3dss1.c 2007-12-15 05:19:40.242714340 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/l3dss1.c 2007-12-15 05:19:55.635591530 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/l3dss1.c ++++ linux-2.4.35.4/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 $ @@ -10437,8 +10437,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/l3dss1.c Index: linux-2.4.35.4/drivers/isdn/hisax/l3dss1.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/l3dss1.h 2007-12-15 05:19:40.250714795 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/l3dss1.h 2007-12-15 05:19:55.635591530 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/l3dss1.h ++++ linux-2.4.35.4/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$ @@ -10447,8 +10447,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/l3dss1.h * Index: linux-2.4.35.4/drivers/isdn/hisax/l3ni1.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/l3ni1.c 2007-12-15 05:19:40.254715024 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/l3ni1.c 2007-12-15 05:19:55.635591530 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/l3ni1.c ++++ linux-2.4.35.4/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 $ @@ -10466,8 +10466,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/l3ni1.c Index: linux-2.4.35.4/drivers/isdn/hisax/l3ni1.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/l3ni1.h 2007-12-15 05:19:40.262715480 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/l3ni1.h 2007-12-15 05:19:55.635591530 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/l3ni1.h ++++ linux-2.4.35.4/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$ @@ -10476,8 +10476,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/l3ni1.h * Index: linux-2.4.35.4/drivers/isdn/hisax/lmgr.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/lmgr.c 2007-12-15 05:19:40.270715935 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/lmgr.c 2007-12-15 05:19:55.639591759 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/lmgr.c ++++ linux-2.4.35.4/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$ @@ -10486,8 +10486,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/lmgr.c * Index: linux-2.4.35.4/drivers/isdn/hisax/md5sums.asc =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/md5sums.asc 2007-12-15 05:19:40.278716390 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/md5sums.asc 2007-12-15 05:19:55.639591759 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/md5sums.asc ++++ linux-2.4.35.4/drivers/isdn/hisax/md5sums.asc @@ -1,33 +1,22 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 @@ -10540,8 +10540,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/md5sums.asc ------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 2007-12-15 05:19:40.282716619 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/mic.c 2007-12-15 05:19:55.639591759 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/mic.c ++++ linux-2.4.35.4/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 $ @@ -10559,8 +10559,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/mic.c #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 2007-12-15 05:19:40.290717075 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/netjet.c 2007-12-15 05:19:55.639591759 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/netjet.c ++++ linux-2.4.35.4/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 $ @@ -10587,7 +10587,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/netjet.c /* Interface functions */ -@@ -135,7 +133,6 @@ +@@ -135,7 +133,6 @@ void mode_tiger(struct BCState *bcs, int mode, int bc) { struct IsdnCardState *cs = bcs->cs; @@ -10595,7 +10595,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/netjet.c if (cs->debug & L1_DEB_HSCX) debugl1(cs, "Tiger mode %d bchan %d/%d", -@@ -157,15 +154,6 @@ +@@ -157,15 +154,6 @@ mode_tiger(struct BCState *bcs, int mode cs->hw.njet.dmactrl); byteout(cs->hw.njet.base + NETJET_IRQMASK0, 0); } @@ -10611,7 +10611,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/netjet.c break; case (L1_MODE_TRANS): break; -@@ -191,14 +179,6 @@ +@@ -191,14 +179,6 @@ mode_tiger(struct BCState *bcs, int mode bcs->hw.tiger.sendp = bcs->hw.tiger.send; bcs->hw.tiger.free = NETJET_DMA_TXSIZE; test_and_set_bit(BC_FLG_EMPTY, &bcs->Flag); @@ -10626,7 +10626,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/netjet.c break; } if (cs->debug & L1_DEB_HSCX) -@@ -874,13 +854,9 @@ +@@ -874,13 +854,9 @@ tiger_l2l1(struct PStack *st, int pr, vo case (PH_ACTIVATE | REQUEST): test_and_set_bit(BC_FLG_ACTIV, &st->l1.bcs->Flag); mode_tiger(st->l1.bcs, st->l1.mode, st->l1.bc); @@ -10642,8 +10642,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/netjet.c 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 2007-12-15 05:19:40.298717530 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/netjet.h 2007-12-15 05:19:55.639591759 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/netjet.h ++++ linux-2.4.35.4/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 $ @@ -10652,8 +10652,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/netjet.h * Index: linux-2.4.35.4/drivers/isdn/hisax/niccy.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/niccy.c 2007-12-15 05:19:40.306717988 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/niccy.c 2007-12-15 05:19:55.643591986 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/niccy.c ++++ linux-2.4.35.4/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 $ @@ -10673,7 +10673,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/niccy.c #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) -@@ -239,9 +239,6 @@ +@@ -239,9 +239,6 @@ niccy_card_msg(struct IsdnCardState *cs, } static struct pci_dev *niccy_dev __initdata = NULL; @@ -10683,7 +10683,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/niccy.c int __init setup_niccy(struct IsdnCard *card) -@@ -253,39 +250,7 @@ +@@ -253,39 +250,7 @@ setup_niccy(struct IsdnCard *card) printk(KERN_INFO "HiSax: Niccy driver Rev. %s\n", HiSax_getrev(tmp)); if (cs->typ != ISDN_CTYPE_NICCY) return (0); @@ -10724,7 +10724,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/niccy.c if (card->para[1]) { cs->hw.niccy.isac = card->para[1] + ISAC_PNP; cs->hw.niccy.hscx = card->para[1] + HSCX_PNP; -@@ -331,12 +296,12 @@ +@@ -331,12 +296,12 @@ setup_niccy(struct IsdnCard *card) return(0); } cs->irq = niccy_dev->irq; @@ -10741,8 +10741,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/niccy.c 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 2007-12-15 05:19:40.314718444 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/nj_s.c 2007-12-15 05:19:55.643591986 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/nj_s.c ++++ linux-2.4.35.4/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 $ @@ -10763,7 +10763,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/nj_s.c static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off) { -@@ -130,7 +131,6 @@ +@@ -130,7 +131,6 @@ NETjet_S_card_msg(struct IsdnCardState * release_io_netjet(cs); return(0); case CARD_INIT: @@ -10771,7 +10771,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/nj_s.c inittiger(cs); clear_pending_isac_ints(cs); initisac(cs); -@@ -180,19 +180,11 @@ +@@ -180,19 +180,11 @@ setup_netjet_s(struct IsdnCard *card) printk(KERN_WARNING "NETjet-S: No IRQ for PCI card found\n"); return(0); } @@ -10792,7 +10792,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/nj_s.c } else { printk(KERN_WARNING "NETjet-S: No PCI card found\n"); return(0); -@@ -263,6 +255,7 @@ +@@ -263,6 +255,7 @@ setup_netjet_s(struct IsdnCard *card) } else { request_region(cs->hw.njet.base, bytecnt, "netjet-s isdn"); } @@ -10802,8 +10802,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/nj_s.c 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 2007-12-15 05:19:40.318718670 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/nj_u.c 2007-12-15 05:19:55.643591986 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/nj_u.c ++++ linux-2.4.35.4/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 $ @@ -10824,7 +10824,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/nj_u.c static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off) { -@@ -181,7 +182,7 @@ +@@ -181,7 +182,7 @@ setup_netjet_u(struct IsdnCard *card) printk(KERN_WARNING "NETspider-U: No IRQ for PCI card found\n"); return(0); } @@ -10835,15 +10835,15 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/nj_u.c return(0); Index: linux-2.4.35.4/drivers/isdn/hisax/q931.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/q931.c 2007-12-15 05:19:40.326719128 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/q931.c 2007-12-15 05:19:55.647592212 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/q931.c ++++ linux-2.4.35.4/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 $ * * code to decode ITU Q.931 call control messages * -@@ -197,6 +197,31 @@ +@@ -197,6 +197,31 @@ struct MessageType mt_n1[] = #define MT_N1_LEN (sizeof(mt_n1) / sizeof(struct MessageType)) @@ -10877,8 +10877,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/q931.c prbits(char *dest, u_char b, int start, int len) Index: linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.c 2007-12-15 05:19:55.647592212 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.c @@ -0,0 +1,543 @@ +/* $Id: rawhdlc.c,v 1.7 2001/09/24 13:22:57 kai Exp $ + * @@ -11425,8 +11425,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.c +#endif Index: linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.h 2007-12-15 05:19:55.647592212 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/isdn/hisax/rawhdlc.h @@ -0,0 +1,28 @@ +/* $Id: rawhdlc.h,v 1.5 2001/09/24 13:22:57 kai Exp $ + * @@ -11458,8 +11458,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/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 2007-12-15 05:19:40.346720268 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/s0box.c 2007-12-15 05:19:55.647592212 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/s0box.c ++++ linux-2.4.35.4/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 $ @@ -11477,8 +11477,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/s0box.c 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 2007-12-15 05:19:40.350720494 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/saphir.c 2007-12-15 05:19:55.647592212 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/saphir.c ++++ linux-2.4.35.4/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 $ @@ -11496,8 +11496,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/saphir.c #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 2007-12-15 05:19:40.358720950 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/sedlbauer.c 2007-12-15 05:19:55.651592441 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/sedlbauer.c ++++ linux-2.4.35.4/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 $ @@ -11527,7 +11527,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/sedlbauer.c #define PCI_SUBVENDOR_SEDLBAUER_PCI 0x53 #define PCI_SUBVENDOR_SPEEDFAX_PCI 0x54 #define PCI_SUB_ID_SEDLBAUER 0x01 -@@ -72,6 +73,7 @@ +@@ -72,6 +73,7 @@ const char *Sedlbauer_Types[] = #define SEDL_SPEED_PCI 6 #define SEDL_SPEEDFAX_PYRAMID 7 #define SEDL_SPEEDFAX_PCI 8 @@ -11535,7 +11535,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/sedlbauer.c #define SEDL_CHIP_TEST 0 #define SEDL_CHIP_ISAC_HSCX 1 -@@ -531,21 +533,6 @@ +@@ -531,21 +533,6 @@ Sedl_card_msg(struct IsdnCardState *cs, static struct pci_dev *dev_sedl __devinitdata = NULL; @@ -11557,7 +11557,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/sedlbauer.c int __devinit setup_sedlbauer(struct IsdnCard *card) { -@@ -581,57 +568,6 @@ +@@ -581,57 +568,6 @@ setup_sedlbauer(struct IsdnCard *card) bytecnt = 16; } } else { @@ -11615,7 +11615,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/sedlbauer.c /* Probe for Sedlbauer speed pci */ #if CONFIG_PCI if (!pci_present()) { -@@ -647,15 +583,15 @@ +@@ -647,15 +583,15 @@ setup_sedlbauer(struct IsdnCard *card) printk(KERN_WARNING "Sedlbauer: No IRQ for PCI card found\n"); return(0); } @@ -11634,7 +11634,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/sedlbauer.c printk(KERN_INFO "Sedlbauer: PCI subvendor:%x subid %x\n", sub_vendor_id, sub_id); printk(KERN_INFO "Sedlbauer: PCI base adr %#x\n", -@@ -670,6 +606,9 @@ +@@ -670,6 +606,9 @@ setup_sedlbauer(struct IsdnCard *card) } else if (sub_vendor_id == PCI_SUBVENDOR_SPEEDFAX_PCI) { cs->hw.sedl.chip = SEDL_CHIP_ISAC_ISAR; cs->subtyp = SEDL_SPEEDFAX_PCI; @@ -11644,7 +11644,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/sedlbauer.c } else if (sub_vendor_id == PCI_SUBVENDOR_SEDLBAUER_PCI) { cs->hw.sedl.chip = SEDL_CHIP_IPAC; cs->subtyp = SEDL_SPEED_PCI; -@@ -683,8 +622,8 @@ +@@ -683,8 +622,8 @@ setup_sedlbauer(struct IsdnCard *card) cs->hw.sedl.reset_off = SEDL_ISAR_PCI_ISAR_RESET_OFF; byteout(cs->hw.sedl.cfg_reg, 0xff); byteout(cs->hw.sedl.cfg_reg, 0x00); @@ -11655,7 +11655,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/sedlbauer.c byteout(cs->hw.sedl.cfg_reg +3, cs->hw.sedl.reset_on); save_flags(flags); sti(); -@@ -697,7 +636,7 @@ +@@ -697,7 +636,7 @@ setup_sedlbauer(struct IsdnCard *card) return (0); #endif /* CONFIG_PCI */ } @@ -11666,8 +11666,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/sedlbauer.c * 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 2007-12-15 05:19:40.366721408 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/sportster.c 2007-12-15 05:19:55.651592441 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/sportster.c ++++ linux-2.4.35.4/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 $ @@ -11685,8 +11685,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/sportster.c #define bytein(addr) inb(addr) Index: linux-2.4.35.4/drivers/isdn/hisax/st5481-debug.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/isdn/hisax/st5481-debug.h 2007-12-15 05:19:55.651592441 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/isdn/hisax/st5481-debug.h @@ -0,0 +1,103 @@ +#define ST5481_DEBUG 0x0 + @@ -11793,9 +11793,9 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481-debug.h + Index: linux-2.4.35.4/drivers/isdn/hisax/st5481.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481.h 2007-12-15 05:19:40.378722089 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/st5481.h 2007-12-15 05:19:55.651592441 +0100 -@@ -219,15 +219,15 @@ +--- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481.h ++++ linux-2.4.35.4/drivers/isdn/hisax/st5481.h +@@ -219,15 +219,15 @@ enum { #define L1_EVENT_COUNT (EV_TIMER3 + 1) #define ERR(format, arg...) \ @@ -11815,7 +11815,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481.h #include "fsm.h" #include "hisax_if.h" #include <linux/skbuff.h> -@@ -236,7 +236,7 @@ +@@ -236,7 +236,7 @@ printk(KERN_INFO "%s:%s: " format "\n" , * FIFO handling */ @@ -11824,7 +11824,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481.h struct fifo { u_char r,w,count,size; spinlock_t lock; -@@ -270,7 +270,7 @@ +@@ -270,7 +270,7 @@ static inline int fifo_add(struct fifo * index = -1; } else { // Return index where to get the next data to add to the FIFO @@ -11833,7 +11833,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481.h fifo->count++; } spin_unlock_irqrestore(&fifo->lock, flags); -@@ -289,13 +289,13 @@ +@@ -289,13 +289,13 @@ static inline int fifo_remove(struct fif return -1; } @@ -11849,7 +11849,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481.h fifo->count--; } spin_unlock_irqrestore(&fifo->lock, flags); -@@ -309,7 +309,7 @@ +@@ -309,7 +309,7 @@ static inline int fifo_remove(struct fif typedef void (*ctrl_complete_t)(void *); typedef struct ctrl_msg { @@ -11858,7 +11858,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481.h ctrl_complete_t complete; void *context; } ctrl_msg; -@@ -336,7 +336,7 @@ +@@ -336,7 +336,7 @@ struct st5481_intr { }; struct st5481_d_out { @@ -11867,7 +11867,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481.h struct urb *urb[2]; /* double buffering */ unsigned long busy; struct sk_buff *tx_skb; -@@ -344,7 +344,7 @@ +@@ -344,7 +344,7 @@ struct st5481_d_out { }; struct st5481_b_out { @@ -11876,7 +11876,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481.h struct urb *urb[2]; /* double buffering */ u_char flow_event; u_long busy; -@@ -352,7 +352,7 @@ +@@ -352,7 +352,7 @@ struct st5481_b_out { }; struct st5481_in { @@ -11885,7 +11885,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481.h struct urb *urb[2]; /* double buffering */ int mode; int bufsize; -@@ -478,7 +478,7 @@ +@@ -478,7 +478,7 @@ extern int st5481_debug; if (level & __debug_variable) dump_iso_packet(__FUNCTION__,urb) static void __attribute__((unused)) @@ -11896,9 +11896,9 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481.h 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 2007-12-15 05:19:40.386722547 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/st5481_b.c 2007-12-15 05:19:55.651592441 +0100 -@@ -67,28 +67,24 @@ +--- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_b.c ++++ linux-2.4.35.4/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) bytes_sent = skb->len; @@ -11935,7 +11935,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_b.c /* if (!(bcs->tx_skb = skb_dequeue(&bcs->sq))) { */ /* st5481B_sched_event(bcs, B_XMTBUFREADY); */ /* } */ -@@ -99,9 +95,9 @@ +@@ -99,9 +95,9 @@ static void usb_b_out(struct st5481_bcs len = buf_size; } else { // Send flags @@ -11948,7 +11948,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_b.c } } } -@@ -213,7 +209,7 @@ +@@ -213,7 +209,7 @@ static void st5481B_mode(struct st5481_b if (bcs->mode != L1_MODE_NULL) { // Open the B channel if (bcs->mode != L1_MODE_TRANS) { @@ -11957,7 +11957,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_b.c } st5481_usb_pipe_reset(adapter, (bcs->channel+1)*2, NULL, NULL); -@@ -279,7 +275,7 @@ +@@ -279,7 +275,7 @@ static int __devinit st5481_setup_b_out( usb_b_out_complete, bcs); } @@ -11966,7 +11966,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_b.c { struct st5481_b_out *b_out = &bcs->b_out; -@@ -320,7 +316,7 @@ +@@ -320,7 +316,7 @@ int __devinit st5481_setup_b(struct st54 /* * Release buffers and URBs for the B channels */ @@ -11977,9 +11977,9 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_b.c Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_d.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_d.c 2007-12-15 05:19:40.394723003 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/st5481_d.c 2007-12-15 05:19:55.655592670 +0100 -@@ -162,8 +162,8 @@ +--- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_d.c ++++ linux-2.4.35.4/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}, {ST_L1_F8, EV_IND_AP, l1_go_f6}, @@ -11990,7 +11990,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_d.c {ST_L1_F8, EV_IND_RSY, l1_ignore}, }; -@@ -297,7 +297,7 @@ +@@ -297,7 +297,7 @@ static void usb_d_out(struct st5481_adap unsigned int num_packets, packet_offset; int len, buf_size, bytes_sent; struct sk_buff *skb; @@ -11999,7 +11999,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_d.c if (d_out->fsm.state != ST_DOUT_NORMAL) return; -@@ -313,15 +313,15 @@ +@@ -313,15 +313,15 @@ static void usb_d_out(struct st5481_adap buf_size = NUM_ISO_PACKETS_D * SIZE_ISO_PACKETS_D_OUT; if (skb) { @@ -12021,7 +12021,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_d.c } if (len < buf_size) { -@@ -413,7 +413,7 @@ +@@ -413,7 +413,7 @@ static void dout_start_xmit(struct FsmIn DBG(2,"len=%d",skb->len); @@ -12030,7 +12030,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_d.c if (test_and_set_bit(buf_nr, &d_out->busy)) { WARN("ep %d urb %d busy %#lx", EP_D_OUT, buf_nr, d_out->busy); -@@ -422,9 +422,9 @@ +@@ -422,9 +422,9 @@ static void dout_start_xmit(struct FsmIn urb = d_out->urb[buf_nr]; DBG_SKB(0x10, skb); @@ -12043,7 +12043,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_d.c skb_pull(skb, bytes_sent); if(len < 16) -@@ -673,7 +673,7 @@ +@@ -673,7 +673,7 @@ static int __devinit st5481_setup_d_out( usb_d_out_complete, adapter); } @@ -12052,7 +12052,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_d.c { struct st5481_d_out *d_out = &adapter->d_out; -@@ -723,7 +723,7 @@ +@@ -723,7 +723,7 @@ int __devinit st5481_setup_d(struct st54 return retval; } @@ -12063,8 +12063,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_d.c Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_init.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_init.c 2007-12-15 05:19:40.398723229 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/st5481_init.c 2007-12-15 05:19:55.655592670 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_init.c ++++ linux-2.4.35.4/drivers/isdn/hisax/st5481_init.c @@ -14,6 +14,7 @@ * TODO: * @@ -12073,7 +12073,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_init.c * hotplug / unregister issues * mod_inc/dec_use_count * unify parts of d/b channel usb handling -@@ -177,7 +178,7 @@ +@@ -177,7 +178,7 @@ MODULE_DEVICE_TABLE (usb, st5481_ids); static struct usb_driver st5481_usb_driver = { name: "st5481_usb", probe: probe_st5481, @@ -12084,9 +12084,9 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_init.c Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_usb.c 2007-12-15 05:19:40.406723687 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c 2007-12-15 05:19:55.655592670 +0100 -@@ -41,9 +41,9 @@ +--- linux-2.4.35.4.orig/drivers/isdn/hisax/st5481_usb.c ++++ linux-2.4.35.4/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]; DBG(1,"request=0x%02x,value=0x%04x,index=%x", @@ -12099,7 +12099,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c // Prepare the URB urb->dev = adapter->usb_dev; -@@ -69,11 +69,11 @@ +@@ -69,11 +69,11 @@ void usb_ctrl_msg(struct st5481_adapter } ctrl_msg = &ctrl->msg_fifo.data[w_index]; @@ -12116,7 +12116,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c ctrl_msg->complete = complete; ctrl_msg->context = context; -@@ -140,17 +140,17 @@ +@@ -140,17 +140,17 @@ static void usb_ctrl_complete(struct urb ctrl_msg = (struct ctrl_msg *)urb->setup_packet; @@ -12140,7 +12140,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c 0); -@@ -235,7 +235,7 @@ +@@ -235,7 +235,7 @@ int __devinit st5481_setup_usb(struct st struct usb_interface_descriptor *altsetting; struct usb_endpoint_descriptor *endpoint; int status; @@ -12149,7 +12149,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c u_char *buf; DBG(1,""); -@@ -307,7 +307,7 @@ +@@ -307,7 +307,7 @@ int __devinit st5481_setup_usb(struct st * Release buffers and URBs for the interrupt and control * endpoint. */ @@ -12158,7 +12158,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c { struct st5481_intr *intr = &adapter->intr; struct st5481_ctrl *ctrl = &adapter->ctrl; -@@ -443,7 +443,7 @@ +@@ -443,7 +443,7 @@ st5481_setup_isocpipes(struct urb* urb[2 return retval; } @@ -12167,7 +12167,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c { int j; -@@ -484,18 +484,16 @@ +@@ -484,18 +484,16 @@ static void usb_in_complete(struct urb * ptr = urb->transfer_buffer; while (len > 0) { if (in->mode == L1_MODE_TRANS) { @@ -12191,7 +12191,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c if (status > 0) { // Good frame received DBG(4,"count=%d",status); -@@ -549,7 +547,7 @@ +@@ -549,7 +547,7 @@ int __devinit st5481_setup_in(struct st5 return retval; } @@ -12200,7 +12200,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c { DBG(2,""); -@@ -562,8 +560,7 @@ +@@ -562,8 +560,7 @@ void st5481_release_in(struct st5481_in */ int st5481_isoc_flatten(struct urb *urb) { @@ -12210,7 +12210,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c unsigned char *src,*dst; unsigned int len; -@@ -624,10 +621,15 @@ +@@ -624,10 +621,15 @@ void st5481_in_mode(struct st5481_in *in if (in->mode != L1_MODE_NULL) { if (in->mode != L1_MODE_TRANS) @@ -12230,8 +12230,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/st5481_usb.c NULL, NULL); Index: linux-2.4.35.4/drivers/isdn/hisax/tei.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/tei.c 2007-12-15 05:19:40.414724143 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/tei.c 2007-12-15 05:19:55.655592670 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/tei.c ++++ linux-2.4.35.4/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 $ @@ -12249,8 +12249,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/tei.c #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 2007-12-15 05:19:40.422724598 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/teleint.c 2007-12-15 05:19:55.659592899 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/teleint.c ++++ linux-2.4.35.4/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 $ @@ -12268,8 +12268,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/teleint.c #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 2007-12-15 05:19:40.430725053 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/teles0.c 2007-12-15 05:19:55.659592899 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/teles0.c ++++ linux-2.4.35.4/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 $ @@ -12285,7 +12285,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/teles0.c #define TELES_IOMEM_SIZE 0x400 #define byteout(addr,val) outb(val,addr) -@@ -189,8 +189,10 @@ +@@ -189,8 +189,10 @@ release_io_teles0(struct IsdnCardState * { if (cs->hw.teles0.cfg_reg) release_region(cs->hw.teles0.cfg_reg, 8); @@ -12296,7 +12296,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/teles0.c } static int -@@ -327,6 +329,7 @@ +@@ -327,6 +329,7 @@ setup_teles0(struct IsdnCard *card) /* 16.0 and 8.0 designed for IOM1 */ test_and_set_bit(HW_IOM1, &cs->HW_Flags); cs->hw.teles0.phymem = card->para[1]; @@ -12304,7 +12304,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/teles0.c if (check_mem_region(cs->hw.teles0.phymem, TELES_IOMEM_SIZE)) { printk(KERN_WARNING "HiSax: %s memory region %lx-%lx already in use\n", -@@ -342,6 +345,9 @@ +@@ -342,6 +345,9 @@ setup_teles0(struct IsdnCard *card) } cs->hw.teles0.membase = (unsigned long) ioremap(cs->hw.teles0.phymem, TELES_IOMEM_SIZE); @@ -12316,8 +12316,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/teles0.c 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 2007-12-15 05:19:40.434725282 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/teles3.c 2007-12-15 05:19:55.659592899 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/teles3.c ++++ linux-2.4.35.4/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 $ @@ -12340,7 +12340,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/teles3.c #define byteout(addr,val) outb(val,addr) #define bytein(addr) inb(addr) -@@ -255,24 +254,6 @@ +@@ -255,24 +254,6 @@ Teles_card_msg(struct IsdnCardState *cs, return(0); } @@ -12365,7 +12365,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/teles3.c int __devinit setup_teles3(struct IsdnCard *card) { -@@ -286,47 +267,6 @@ +@@ -286,47 +267,6 @@ setup_teles3(struct IsdnCard *card) && (cs->typ != ISDN_CTYPE_TELESPCMCIA) && (cs->typ != ISDN_CTYPE_COMPAQ_ISA)) return (0); @@ -12415,8 +12415,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/teles3.c 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 2007-12-15 05:19:40.442725738 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/telespci.c 2007-12-15 05:19:55.659592899 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/telespci.c ++++ linux-2.4.35.4/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 $ @@ -12435,7 +12435,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/telespci.c #define ZORAN_PO_RQ_PEN 0x02000000 #define ZORAN_PO_WR 0x00800000 -@@ -307,10 +308,10 @@ +@@ -307,10 +308,10 @@ setup_telespci(struct IsdnCard *card) printk(KERN_WARNING "Teles: No IRQ for PCI card found\n"); return(0); } @@ -12450,8 +12450,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/telespci.c return(0); Index: linux-2.4.35.4/drivers/isdn/hisax/w6692.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/w6692.c 2007-12-15 05:19:40.450726193 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/w6692.c 2007-12-15 05:19:55.659592899 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/w6692.c ++++ linux-2.4.35.4/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 $ @@ -12466,7 +12466,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/w6692.c /* table entry in the PCI devices list */ typedef struct { -@@ -29,20 +30,14 @@ +@@ -29,20 +30,14 @@ typedef struct { static const PCI_ENTRY id_list[] = { @@ -12490,7 +12490,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/w6692.c #define DBUSY_TIMER_VALUE 80 -@@ -675,6 +670,16 @@ +@@ -675,6 +670,16 @@ setstack_W6692(struct PStack *st, struct static void DC_Close_W6692(struct IsdnCardState *cs) { @@ -12507,7 +12507,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/w6692.c } static void -@@ -865,38 +870,31 @@ +@@ -865,38 +870,31 @@ setstack_w6692(struct PStack *st, struct return (0); } @@ -12562,7 +12562,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/w6692.c ph_command(cs, W_L1CMD_RST); cs->dc.w6692.ph_state = W_L1CMD_RST; W6692_new_ph(cs); -@@ -963,14 +961,9 @@ +@@ -963,14 +961,9 @@ w6692_card_msg(struct IsdnCardState *cs, { switch (mt) { case CARD_RESET: @@ -12577,7 +12577,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/w6692.c return (0); case CARD_INIT: initW6692(cs, 3); -@@ -1013,7 +1006,6 @@ +@@ -1013,7 +1006,6 @@ setup_w6692(struct IsdnCard *card) if (dev_w6692) { if (pci_enable_device(dev_w6692)) continue; @@ -12585,7 +12585,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/w6692.c break; } id_idx++; -@@ -1023,14 +1015,7 @@ +@@ -1023,14 +1015,7 @@ setup_w6692(struct IsdnCard *card) pci_irq = dev_w6692->irq; /* I think address 0 is allways the configuration area */ /* and address 1 is the real IO space KKe 03.09.99 */ @@ -12601,7 +12601,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/w6692.c } if (!found) { printk(KERN_WARNING "W6692: No PCI card found\n"); -@@ -1047,18 +1032,18 @@ +@@ -1047,18 +1032,18 @@ setup_w6692(struct IsdnCard *card) } cs->hw.w6692.iobase = pci_ioaddr; printk(KERN_INFO "Found: %s %s, I/O base: 0x%x, irq: %d\n", @@ -12624,7 +12624,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/w6692.c } #else printk(KERN_WARNING "HiSax: W6692 and NO_PCI_BIOS\n"); -@@ -1068,7 +1053,7 @@ +@@ -1068,7 +1053,7 @@ setup_w6692(struct IsdnCard *card) printk(KERN_INFO "HiSax: %s config irq:%d I/O:%x\n", @@ -12635,8 +12635,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/w6692.c 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 2007-12-15 05:19:40.458726649 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/w6692.h 2007-12-15 05:19:55.663593126 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/w6692.h ++++ linux-2.4.35.4/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 $ @@ -12645,8 +12645,8 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/w6692.h * Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hysdn/boardergo.c 2007-12-15 05:19:40.466727107 +0100 -+++ linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c 2007-12-15 05:19:55.667593352 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hysdn/boardergo.c ++++ linux-2.4.35.4/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 $ - * @@ -12699,7 +12699,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c #include "hysdn_defs.h" #include "boardergo.h" -@@ -45,11 +59,10 @@ +@@ -45,11 +59,10 @@ ergo_interrupt(int intno, void *dev_id, if (!card->irq_enabled) return; /* other device interrupting or irq switched off */ @@ -12713,7 +12713,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c return; /* no interrupt requested by E1 */ } /* clear any pending ints on the board */ -@@ -63,7 +76,7 @@ +@@ -63,7 +76,7 @@ ergo_interrupt(int intno, void *dev_id, queue_task(&card->irq_queue, &tq_immediate); mark_bh(IMMEDIATE_BH); } @@ -12722,7 +12722,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c } /* ergo_interrupt */ /******************************************************************************/ -@@ -83,17 +96,15 @@ +@@ -83,17 +96,15 @@ ergo_irq_bh(hysdn_card * card) return; /* invalid call */ dpr = card->dpram; /* point to DPRAM */ @@ -12742,7 +12742,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c again = 0; /* assume loop not to be repeated */ if (!dpr->ToHyFlag) { -@@ -113,15 +124,13 @@ +@@ -113,15 +124,13 @@ ergo_irq_bh(hysdn_card * card) again = 1; /* restart loop */ } } /* a message has arrived for us */ @@ -12759,7 +12759,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c } /* ergo_irq_bh */ -@@ -138,8 +147,7 @@ +@@ -138,8 +147,7 @@ ergo_stopcard(hysdn_card * card) #ifdef CONFIG_HYSDN_CAPI hycapi_capi_stop(card); #endif /* CONFIG_HYSDN_CAPI */ @@ -12769,7 +12769,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c val = bytein(card->iobase + PCI9050_INTR_REG); /* get actual value */ val &= ~(PCI9050_INTR_REG_ENPCI | PCI9050_INTR_REG_EN1); /* mask irq */ byteout(card->iobase + PCI9050_INTR_REG, val); -@@ -147,8 +155,7 @@ +@@ -147,8 +155,7 @@ ergo_stopcard(hysdn_card * card) byteout(card->iobase + PCI9050_USER_IO, PCI9050_E1_RESET); /* reset E1 processor */ card->state = CARD_STATE_UNUSED; card->err_log_state = ERRLOG_STATE_OFF; /* currently no log active */ @@ -12779,7 +12779,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c } /* ergo_stopcard */ /**************************************************************************/ -@@ -163,20 +170,17 @@ +@@ -163,20 +170,17 @@ ergo_set_errlog_state(hysdn_card * card, card->err_log_state = ERRLOG_STATE_OFF; /* must be off */ return; } @@ -12803,7 +12803,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c queue_task(&card->irq_queue, &tq_immediate); mark_bh(IMMEDIATE_BH); } /* ergo_set_errlog_state */ -@@ -245,9 +249,6 @@ +@@ -245,9 +249,6 @@ ergo_writebootimg(struct HYSDN_CARD *car while (!dpram->ToHyNoDpramErrLog); /* reread volatile register to flush PCI */ byteout(card->iobase + PCI9050_USER_IO, PCI9050_E1_RUN); /* start E1 processor */ @@ -12813,7 +12813,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c set_current_state(TASK_INTERRUPTIBLE); schedule_timeout((20 * HZ) / 1000); /* Timeout 20ms */ -@@ -282,7 +283,6 @@ +@@ -282,7 +283,6 @@ ergo_writebootseq(struct HYSDN_CARD *car dst = sp->Data; /* point to data in spool structure */ buflen = sp->Len; /* maximum len of spooled data */ wr_mirror = sp->WrPtr; /* only once read */ @@ -12821,7 +12821,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c /* try until all bytes written or error */ i = 0x1000; /* timeout value */ -@@ -358,9 +358,7 @@ +@@ -358,9 +358,7 @@ ergo_waitpofready(struct HYSDN_CARD *car if (card->debug_flags & LOG_POF_RECORD) hysdn_addlog(card, "ERGO: pof boot success"); @@ -12832,7 +12832,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c card->state = CARD_STATE_RUN; /* now card is running */ /* enable the cards interrupt */ byteout(card->iobase + PCI9050_INTR_REG, -@@ -371,8 +369,7 @@ +@@ -371,8 +369,7 @@ ergo_waitpofready(struct HYSDN_CARD *car dpr->ToPcFlag = 0; /* reset data indicator */ dpr->ToHyInt = 1; dpr->ToPcInt = 1; /* interrupt to E1 for all cards */ @@ -12842,7 +12842,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c if ((hynet_enable & (1 << card->myid)) && (i = hysdn_net_create(card))) { -@@ -387,7 +384,6 @@ +@@ -387,7 +384,6 @@ ergo_waitpofready(struct HYSDN_CARD *car #endif /* CONFIG_HYSDN_CAPI */ return (0); /* success */ } /* data has arrived */ @@ -12852,8 +12852,8 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.c } /* 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 2007-12-15 05:19:40.470727333 +0100 -+++ linux-2.4.35.4/drivers/isdn/hysdn/boardergo.h 2007-12-15 05:19:55.667593352 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hysdn/boardergo.h ++++ linux-2.4.35.4/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$ @@ -12870,8 +12870,8 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/boardergo.h /* 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 2007-12-15 05:19:40.478727788 +0100 -+++ linux-2.4.35.4/drivers/isdn/hysdn/hycapi.c 2007-12-15 05:19:55.671593581 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hysdn/hycapi.c ++++ linux-2.4.35.4/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$ @@ -12889,15 +12889,15 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hycapi.c 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 2007-12-15 05:19:40.486728246 +0100 -+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_boot.c 2007-12-15 05:19:55.671593581 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_boot.c ++++ linux-2.4.35.4/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$ * * Linux driver for HYSDN cards * specific routines for booting and pof handling -@@ -143,7 +143,7 @@ +@@ -143,7 +143,7 @@ pof_handle_data(hysdn_card * card, int d (boot->pof_recid == TAG_CABSDATA) ? "CABSDATA" : "ABSDATA", datlen, boot->pof_recoffset); @@ -12908,8 +12908,8 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_boot.c 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 2007-12-15 05:19:40.494728702 +0100 -+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_defs.h 2007-12-15 05:19:55.671593581 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_defs.h ++++ linux-2.4.35.4/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 $ @@ -12928,7 +12928,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_defs.h /****************************/ /* storage type definitions */ -@@ -176,6 +181,7 @@ +@@ -176,6 +181,7 @@ typedef struct HYSDN_CARD { struct tq_struct irq_queue; /* interrupt task queue */ uchar volatile irq_enabled; /* interrupt enabled if != 0 */ uchar volatile hw_lock; /* hardware is currently locked -> no access */ @@ -12938,8 +12938,8 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_defs.h 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 2007-12-15 05:19:40.502729157 +0100 -+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_init.c 2007-12-15 05:19:55.671593581 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_init.c ++++ linux-2.4.35.4/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$ @@ -12954,7 +12954,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_init.c static struct pci_device_id hysdn_pci_tbl[] __initdata = { {PCI_VENDOR_ID_HYPERCOPE, PCI_DEVICE_ID_HYPERCOPE_PLX, PCI_ANY_ID, PCI_SUBDEVICE_ID_HYPERCOPE_METRO}, {PCI_VENDOR_ID_HYPERCOPE, PCI_DEVICE_ID_HYPERCOPE_PLX, PCI_ANY_ID, PCI_SUBDEVICE_ID_HYPERCOPE_CHAMP2}, -@@ -29,11 +30,12 @@ +@@ -29,11 +30,12 @@ static struct pci_device_id hysdn_pci_tb { } /* Terminating entry */ }; MODULE_DEVICE_TABLE(pci, hysdn_pci_tbl); @@ -12968,7 +12968,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_init.c int cardmax; /* number of found cards */ hysdn_card *card_root = NULL; /* pointer to first card */ -@@ -91,11 +93,11 @@ +@@ -91,11 +93,11 @@ search_cards(void) card->myid = cardmax; /* set own id */ card->bus = akt_pcidev->bus->number; card->devfn = akt_pcidev->devfn; /* slot + function */ @@ -12986,15 +12986,15 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_init.c 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 2007-12-15 05:19:40.506729386 +0100 -+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c 2007-12-15 05:19:55.675593810 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_net.c ++++ linux-2.4.35.4/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$ * * Linux driver for HYSDN cards, net (ethernet type) handling routines. * -@@ -29,7 +29,7 @@ +@@ -29,7 +29,7 @@ unsigned int hynet_enable = 0xffffffff; MODULE_PARM(hynet_enable, "i"); /* store the actual version for log reporting */ @@ -13003,7 +13003,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c #define MAX_SKB_BUFFERS 20 /* number of buffers for keeping TX-data */ -@@ -45,6 +45,10 @@ +@@ -45,6 +45,10 @@ struct net_local { /* additional vars may be added here */ char dev_name[9]; /* our own device name */ @@ -13014,7 +13014,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c /* Tx control lock. This protects the transmit buffer ring * state along with the "tx full" state of the driver. This * means all netif_queue flow control actions are protected -@@ -56,6 +60,7 @@ +@@ -56,6 +60,7 @@ struct net_local { int sk_count; /* number of buffers currently in ring */ int is_open; /* flag controlling module locking */ @@ -13022,7 +13022,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c }; /* net_local */ -@@ -83,11 +88,19 @@ +@@ -83,11 +88,19 @@ net_open(struct net_device *dev) hysdn_card *card = dev->priv; int i; @@ -13042,7 +13042,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c /* Fill in the MAC-level header (if not already set) */ if (!card->mac_addr[0]) { -@@ -104,6 +117,7 @@ +@@ -104,6 +117,7 @@ net_open(struct net_device *dev) return (0); } /* net_open */ @@ -13050,7 +13050,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c /*******************************************/ /* flush the currently occupied tx-buffers */ /* must only be called when device closed */ -@@ -119,6 +133,7 @@ +@@ -119,6 +133,7 @@ flush_tx_buffers(struct net_local *nl) nl->sk_count--; } } /* flush_tx_buffers */ @@ -13058,7 +13058,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c /*********************************************************************/ -@@ -129,6 +144,15 @@ +@@ -129,6 +144,15 @@ static int net_close(struct net_device *dev) { @@ -13074,7 +13074,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c netif_stop_queue(dev); /* disable queueing */ if (((struct net_local *) dev)->is_open) -@@ -136,9 +160,52 @@ +@@ -136,9 +160,52 @@ net_close(struct net_device *dev) ((struct net_local *) dev)->is_open = 0; flush_tx_buffers((struct net_local *) dev); @@ -13127,7 +13127,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c /************************************/ /* send a packet on this interface. */ /* new style for kernel >= 2.3.33 */ -@@ -176,6 +243,7 @@ +@@ -176,6 +243,7 @@ net_send_packet(struct sk_buff *skb, str return (0); /* success */ } /* net_send_packet */ @@ -13135,7 +13135,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c /***********************************************************************/ -@@ -190,6 +258,15 @@ +@@ -190,6 +258,15 @@ hysdn_tx_netack(hysdn_card * card) if (!lp) return; /* non existing device */ @@ -13151,7 +13151,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c if (!lp->sk_count) return; /* error condition */ -@@ -203,6 +280,7 @@ +@@ -203,6 +280,7 @@ hysdn_tx_netack(hysdn_card * card) if (lp->sk_count-- == MAX_SKB_BUFFERS) /* dec usage count */ netif_start_queue((struct net_device *) lp); @@ -13159,7 +13159,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c } /* hysdn_tx_netack */ /*****************************************************/ -@@ -250,10 +328,15 @@ +@@ -250,10 +328,15 @@ hysdn_tx_netget(hysdn_card * card) if (!lp) return (NULL); /* non existing device */ @@ -13175,7 +13175,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c } /* hysdn_tx_netget */ -@@ -296,15 +379,21 @@ +@@ -296,15 +379,21 @@ hysdn_net_create(hysdn_card * card) } memset(dev, 0, sizeof(struct net_local)); /* clean the structure */ @@ -13197,7 +13197,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c if ((i = register_netdev(dev))) { printk(KERN_WARNING "HYSDN: unable to create network device\n"); kfree(dev); -@@ -333,7 +422,9 @@ +@@ -333,7 +422,9 @@ hysdn_net_release(hysdn_card * card) card->netif = NULL; /* clear out pointer */ dev->stop(dev); /* close the device */ @@ -13209,8 +13209,8 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_net.c 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 2007-12-15 05:19:40.514729842 +0100 -+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_pof.h 2007-12-15 05:19:55.675593810 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_pof.h ++++ linux-2.4.35.4/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$ @@ -13219,8 +13219,8 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_pof.h * Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_procconf.c 2007-12-15 05:19:40.522730297 +0100 -+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c 2007-12-15 05:19:55.675593810 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_procconf.c ++++ linux-2.4.35.4/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$ @@ -13242,7 +13242,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c #define INFO_OUT_LEN 80 /* length of info line including lf */ -@@ -212,32 +214,29 @@ +@@ -212,32 +214,29 @@ hysdn_conf_write(struct file *file, cons static ssize_t hysdn_conf_read(struct file *file, char *buf, size_t count, loff_t * off) { @@ -13292,7 +13292,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c return (i); } /* hysdn_conf_read */ -@@ -254,7 +253,11 @@ +@@ -254,7 +253,11 @@ hysdn_conf_open(struct inode *ino, struc char *cp, *tmp; /* now search the addressed card */ @@ -13304,7 +13304,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c card = card_root; while (card) { pd = card->procconf; -@@ -263,7 +266,11 @@ +@@ -263,7 +266,11 @@ hysdn_conf_open(struct inode *ino, struc card = card->next; /* search next entry */ } if (!card) { @@ -13316,7 +13316,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c return (-ENODEV); /* device is unknown/invalid */ } if (card->debug_flags & (LOG_PROC_OPEN | LOG_PROC_ALL)) -@@ -274,7 +281,11 @@ +@@ -274,7 +281,11 @@ hysdn_conf_open(struct inode *ino, struc /* write only access -> write boot file or conf line */ if (!(cnf = kmalloc(sizeof(struct conf_writedata), GFP_KERNEL))) { @@ -13328,7 +13328,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c return (-EFAULT); } cnf->card = card; -@@ -286,7 +297,11 @@ +@@ -286,7 +297,11 @@ hysdn_conf_open(struct inode *ino, struc /* read access -> output card info data */ if (!(tmp = (char *) kmalloc(INFO_OUT_LEN * 2 + 2, GFP_KERNEL))) { @@ -13340,7 +13340,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c return (-EFAULT); /* out of memory */ } filep->private_data = tmp; /* start of string */ -@@ -320,10 +335,16 @@ +@@ -320,10 +335,16 @@ hysdn_conf_open(struct inode *ino, struc *cp++ = '\n'; *cp = 0; /* end of string */ } else { /* simultaneous read/write access forbidden ! */ @@ -13357,7 +13357,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c return (0); } /* hysdn_conf_open */ -@@ -338,7 +359,9 @@ +@@ -338,7 +359,9 @@ hysdn_conf_close(struct inode *ino, stru int retval = 0; struct proc_dir_entry *pd; @@ -13367,7 +13367,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c /* search the addressed card */ card = card_root; while (card) { -@@ -348,7 +371,9 @@ +@@ -348,7 +371,9 @@ hysdn_conf_close(struct inode *ino, stru card = card->next; /* search next entry */ } if (!card) { @@ -13377,7 +13377,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c return (-ENODEV); /* device is unknown/invalid */ } if (card->debug_flags & (LOG_PROC_OPEN | LOG_PROC_ALL)) -@@ -371,7 +396,11 @@ +@@ -371,7 +396,11 @@ hysdn_conf_close(struct inode *ino, stru if (filep->private_data) kfree(filep->private_data); /* release memory */ } @@ -13389,7 +13389,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c return (retval); } /* hysdn_conf_close */ -@@ -387,6 +416,9 @@ +@@ -387,6 +416,9 @@ static struct file_operations conf_fops release: hysdn_conf_close, }; @@ -13399,7 +13399,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c /*****************************/ /* hysdn subdir in /proc/net */ /*****************************/ -@@ -415,8 +447,17 @@ +@@ -415,8 +447,17 @@ hysdn_procconf_init(void) if ((card->procconf = (void *) create_proc_entry(conf_name, S_IFREG | S_IRUGO | S_IWUSR, hysdn_proc_entry)) != NULL) { @@ -13419,8 +13419,8 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_procconf.c 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 2007-12-15 05:19:40.530730752 +0100 -+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c 2007-12-15 05:19:55.675593810 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_proclog.c ++++ linux-2.4.35.4/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$ @@ -13437,7 +13437,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c #include "hysdn_defs.h" -@@ -115,8 +117,7 @@ +@@ -115,8 +117,7 @@ put_log_buffer(hysdn_card * card, char * strcpy(ib->log_start, cp); /* set output string */ ib->next = NULL; ib->proc_ctrl = pd; /* point to own control structure */ @@ -13447,7 +13447,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c ib->usage_cnt = pd->if_used; if (!pd->log_head) pd->log_head = ib; /* new head */ -@@ -124,7 +125,7 @@ +@@ -124,7 +125,7 @@ put_log_buffer(hysdn_card * card, char * pd->log_tail->next = ib; /* follows existing messages */ pd->log_tail = ib; /* new tail */ i = pd->del_lock++; /* get lock state */ @@ -13456,7 +13456,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c /* delete old entrys */ if (!i) -@@ -210,7 +211,6 @@ +@@ -210,7 +211,6 @@ hysdn_log_read(struct file *file, char * word ino; struct procdata *pd = NULL; hysdn_card *card; @@ -13464,7 +13464,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c if (!*((struct log_data **) file->private_data)) { if (file->f_flags & O_NONBLOCK) -@@ -235,11 +235,11 @@ +@@ -235,11 +235,11 @@ hysdn_log_read(struct file *file, char * return (0); inf->usage_cnt--; /* new usage count */ @@ -13478,7 +13478,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c return (len); } return (0); -@@ -255,7 +255,11 @@ +@@ -255,7 +255,11 @@ hysdn_log_open(struct inode *ino, struct struct procdata *pd = NULL; ulong flags; @@ -13490,7 +13490,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c card = card_root; while (card) { pd = card->proclog; -@@ -264,7 +268,11 @@ +@@ -264,7 +268,11 @@ hysdn_log_open(struct inode *ino, struct card = card->next; /* search next entry */ } if (!card) { @@ -13502,7 +13502,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c return (-ENODEV); /* device is unknown/invalid */ } filep->private_data = card; /* remember our own card */ -@@ -274,19 +282,24 @@ +@@ -274,19 +282,24 @@ hysdn_log_open(struct inode *ino, struct } else if ((filep->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ) { /* read access -> log/debug read */ @@ -13532,7 +13532,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c return (0); } /* hysdn_log_open */ -@@ -306,7 +319,9 @@ +@@ -306,7 +319,9 @@ hysdn_log_close(struct inode *ino, struc int flags, retval = 0; @@ -13542,7 +13542,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c if ((filep->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_WRITE) { /* write only access -> write debug level written */ retval = 0; /* success */ -@@ -314,8 +329,7 @@ +@@ -314,8 +329,7 @@ hysdn_log_close(struct inode *ino, struc /* read access -> log/debug read, mark one further file as closed */ pd = NULL; @@ -13552,7 +13552,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c inf = *((struct log_data **) filep->private_data); /* get first log entry */ if (inf) pd = (struct procdata *) inf->proc_ctrl; /* still entries there */ -@@ -338,7 +352,7 @@ +@@ -338,7 +352,7 @@ hysdn_log_close(struct inode *ino, struc inf->usage_cnt--; /* decrement usage count for buffers */ inf = inf->next; } @@ -13561,7 +13561,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c if (pd) if (pd->if_used <= 0) /* delete buffers if last file closed */ -@@ -348,7 +362,11 @@ +@@ -348,7 +362,11 @@ hysdn_log_close(struct inode *ino, struc kfree(inf); } } /* read access */ @@ -13573,7 +13573,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c return (retval); } /* hysdn_log_close */ -@@ -400,6 +418,9 @@ +@@ -400,6 +418,9 @@ static struct file_operations log_fops = release: hysdn_log_close, }; @@ -13583,7 +13583,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c /***********************************************************************************/ /* hysdn_proclog_init is called when the module is loaded after creating the cards */ -@@ -414,10 +435,20 @@ +@@ -414,10 +435,20 @@ hysdn_proclog_init(hysdn_card * card) if ((pd = (struct procdata *) kmalloc(sizeof(struct procdata), GFP_KERNEL)) != NULL) { memset(pd, 0, sizeof(struct procdata)); @@ -13606,8 +13606,8 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_proclog.c 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 2007-12-15 05:19:40.538731208 +0100 -+++ linux-2.4.35.4/drivers/isdn/hysdn/hysdn_sched.c 2007-12-15 05:19:55.679594039 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hysdn/hysdn_sched.c ++++ linux-2.4.35.4/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 $ @@ -13626,7 +13626,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_sched.c #include <asm/io.h> #include "hysdn_defs.h" -@@ -151,22 +149,19 @@ +@@ -151,22 +149,19 @@ hysdn_tx_cfgline(hysdn_card * card, ucha if (card->debug_flags & LOG_SCHED_ASYN) hysdn_addlog(card, "async tx-cfg chan=%d len=%d", chan, strlen(line) + 1); @@ -13653,7 +13653,7 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_sched.c } /* wait for buffer to become free */ strcpy(card->async_data, line); -@@ -177,31 +172,26 @@ +@@ -177,31 +172,26 @@ hysdn_tx_cfgline(hysdn_card * card, ucha /* now queue the task */ queue_task(&card->irq_queue, &tq_immediate); mark_bh(IMMEDIATE_BH); @@ -13693,15 +13693,15 @@ Index: linux-2.4.35.4/drivers/isdn/hysdn/hysdn_sched.c Index: linux-2.4.35.4/drivers/isdn/icn/icn.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/icn/icn.c 2007-12-15 05:19:40.546731666 +0100 -+++ linux-2.4.35.4/drivers/isdn/icn/icn.c 2007-12-15 05:19:55.679594039 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/icn/icn.c ++++ linux-2.4.35.4/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$ * * ISDN low-level module for the ICN active ISDN-Card. * -@@ -41,7 +41,7 @@ +@@ -41,7 +41,7 @@ MODULE_PARM_DESC(icn_id2, "ID-String of #undef MAP_DEBUG static char @@ -13710,7 +13710,7 @@ Index: linux-2.4.35.4/drivers/isdn/icn/icn.c static int icn_addcard(int, char *, char *); -@@ -1634,6 +1634,7 @@ +@@ -1634,6 +1634,7 @@ icn_addcard(int port, char *id1, char *i } #ifndef MODULE @@ -13718,7 +13718,7 @@ Index: linux-2.4.35.4/drivers/isdn/icn/icn.c static int __init icn_setup(char *line) { -@@ -1643,6 +1644,14 @@ +@@ -1643,6 +1644,14 @@ icn_setup(char *line) static char sid2[20]; str = get_options(line, 2, ints); @@ -13733,7 +13733,7 @@ Index: linux-2.4.35.4/drivers/isdn/icn/icn.c if (ints[0]) portbase = ints[1]; if (ints[0] > 1) -@@ -1656,9 +1665,13 @@ +@@ -1656,9 +1665,13 @@ icn_setup(char *line) icn_id2 = sid2; } } @@ -13749,8 +13749,8 @@ Index: linux-2.4.35.4/drivers/isdn/icn/icn.c 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 2007-12-15 05:19:40.554732121 +0100 -+++ linux-2.4.35.4/drivers/isdn/icn/icn.h 2007-12-15 05:19:55.679594039 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/icn/icn.h ++++ linux-2.4.35.4/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$ @@ -13759,8 +13759,8 @@ Index: linux-2.4.35.4/drivers/isdn/icn/icn.h * Index: linux-2.4.35.4/drivers/isdn/isdn_audio.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_audio.c 2007-12-15 05:19:40.562732576 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_audio.c 2007-12-15 05:19:55.679594039 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdn_audio.c ++++ linux-2.4.35.4/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 $ @@ -13782,7 +13782,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_audio.c /* * Misc. lookup-tables. -@@ -169,19 +169,39 @@ +@@ -169,19 +169,39 @@ static char isdn_audio_ulaw_to_alaw[] = 0x8a, 0x8a, 0x6a, 0x6a, 0xea, 0xea, 0x2a, 0x2a }; @@ -13825,7 +13825,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_audio.c }; static char dtmf_matrix[4][4] = -@@ -208,7 +228,7 @@ +@@ -208,7 +228,7 @@ isdn_audio_tlookup(const u_char *table, : "memory", "ax"); #else while (n--) @@ -13834,7 +13834,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_audio.c #endif } -@@ -479,18 +499,6 @@ +@@ -479,18 +499,6 @@ isdn_audio_goertzel(int *sample, modem_i sk2 = sk1; sk1 = sk; } @@ -13853,7 +13853,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_audio.c result[k] = ((sk * sk) >> AMP_BITS) - ((((cos2pik[k] * sk) >> 15) * sk2) >> AMP_BITS) + -@@ -514,58 +522,28 @@ +@@ -514,58 +522,28 @@ isdn_audio_eval_dtmf(modem_info * info) int grp[2]; char what; char *p; @@ -13927,15 +13927,15 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_audio.c 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 2007-12-15 05:19:40.566732806 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_audio.h 2007-12-15 05:19:55.683594266 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdn_audio.h ++++ linux-2.4.35.4/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 $ * * Linux ISDN subsystem, audio conversion and compression (linklevel). * -@@ -20,7 +20,6 @@ +@@ -20,7 +20,6 @@ typedef struct adpcm_state { typedef struct dtmf_state { char last; @@ -13945,9 +13945,9 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_audio.h } dtmf_state; Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_bsdcomp.c 2007-12-15 05:19:40.574733261 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c 2007-12-15 05:19:55.683594266 +0100 -@@ -105,6 +105,14 @@ +--- linux-2.4.35.4.orig/drivers/isdn/isdn_bsdcomp.c ++++ linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c +@@ -105,6 +105,14 @@ MODULE_LICENSE("Dual BSD/GPL"); #define DEBUG 1 @@ -13962,7 +13962,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c /* * A dictionary for doing BSD compress. */ -@@ -285,7 +293,7 @@ +@@ -285,7 +293,7 @@ static void bsd_free (void *state) * Release the dictionary */ if (db->dict) { @@ -13971,7 +13971,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c db->dict = NULL; } -@@ -293,7 +301,7 @@ +@@ -293,7 +301,7 @@ static void bsd_free (void *state) * Release the string buffer */ if (db->lens) { @@ -13980,7 +13980,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c db->lens = NULL; } -@@ -350,14 +358,19 @@ +@@ -350,14 +358,19 @@ static void *bsd_alloc (struct isdn_ppp_ * Allocate space for the dictionary. This may be more than one page in * length. */ @@ -14003,7 +14003,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c /* * If this is the compression buffer then there is no length data. * For decompression, the length information is needed as well. -@@ -365,7 +378,7 @@ +@@ -365,7 +378,7 @@ static void *bsd_alloc (struct isdn_ppp_ if (!decomp) db->lens = NULL; else { @@ -14012,7 +14012,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c sizeof (db->lens[0])); if (!db->lens) { bsd_free (db); /* calls MOD_DEC_USE_COUNT; */ -@@ -478,7 +491,11 @@ +@@ -478,7 +491,11 @@ static int bsd_compress (void *state, st int hval,disp,ilen,mxcode; unsigned char *rptr = skb_in->data; int isize = skb_in->len; @@ -14024,7 +14024,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c #define OUTPUT(ent) \ { \ bitno -= n_bits; \ -@@ -490,17 +507,45 @@ +@@ -490,17 +507,45 @@ static int bsd_compress (void *state, st bitno += 8; \ } while (bitno <= 24); \ } @@ -14070,7 +14070,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c db = (struct bsd_db *) state; hshift = db->hshift; -@@ -538,6 +583,9 @@ +@@ -538,6 +583,9 @@ static int bsd_compress (void *state, st /* continue probing until a match or invalid entry */ disp = (hval == 0) ? 1 : hval; @@ -14080,7 +14080,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c do { hval += disp; -@@ -546,7 +594,15 @@ +@@ -546,7 +594,15 @@ static int bsd_compress (void *state, st dictp = dict_ptr (db, hval); if (dictp->codem1 >= max_ent) goto nomatch; @@ -14096,7 +14096,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c ent = dictp->codem1 + 1; /* finally found (prefix,suffix) */ continue; -@@ -669,6 +725,9 @@ +@@ -669,6 +725,9 @@ static int bsd_decompress (void *state, int ilen; int codelen; int extra; @@ -14106,7 +14106,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c db = (struct bsd_db *) state; max_ent = db->max_ent; -@@ -677,7 +736,9 @@ +@@ -677,7 +736,9 @@ static int bsd_decompress (void *state, n_bits = db->n_bits; tgtbitno = 32 - n_bits; /* bitno when we have a code */ @@ -14116,7 +14116,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c if(!skb_in || !skb_out) { printk(KERN_ERR "bsd_decompress called with NULL parameter\n"); -@@ -795,7 +856,11 @@ +@@ -795,7 +856,11 @@ static int bsd_decompress (void *state, p = skb_put(skb_out,codelen); p += codelen; @@ -14128,7 +14128,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c struct bsd_dict *dictp2 = dict_ptr (db, finchar); dictp = dict_ptr (db, dictp2->cptr); -@@ -822,6 +887,12 @@ +@@ -822,6 +887,12 @@ static int bsd_decompress (void *state, } } *--p = finchar; @@ -14141,7 +14141,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c #ifdef DEBUG if (--codelen != 0) -@@ -851,12 +922,23 @@ +@@ -851,12 +922,23 @@ static int bsd_decompress (void *state, /* look for a free hash table entry */ if (dictp->codem1 < max_ent) { disp = (hval == 0) ? 1 : hval; @@ -14165,7 +14165,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c } /* -@@ -895,11 +977,21 @@ +@@ -895,11 +977,21 @@ static int bsd_decompress (void *state, db->comp_bytes += skb_in->len - BSD_OVHD; db->uncomp_bytes += skb_out->len; @@ -14189,8 +14189,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_bsdcomp.c Index: linux-2.4.35.4/drivers/isdn/isdn_common.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_common.c 2007-12-15 05:19:40.582733716 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_common.c 2007-12-15 05:19:55.687594492 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdn_common.c ++++ linux-2.4.35.4/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 $ @@ -14215,7 +14215,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c /* Debugflags */ #undef ISDN_DEBUG_STATCALLB -@@ -44,7 +47,7 @@ +@@ -44,7 +47,7 @@ MODULE_LICENSE("GPL"); isdn_dev *dev; @@ -14224,7 +14224,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c extern char *isdn_net_revision; extern char *isdn_tty_revision; -@@ -67,19 +70,19 @@ +@@ -67,19 +70,19 @@ static isdn_divert_if *divert_if; /* = N static int isdn_writebuf_stub(int, int, const u_char *, int, int); static void set_global_features(void); @@ -14248,7 +14248,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c cmd.driver = i; cmd.arg = 0; -@@ -101,10 +104,7 @@ +@@ -101,10 +104,7 @@ isdn_unlock_drivers(void) { int i; @@ -14260,7 +14260,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c if (dev->drv[i]->locks > 0) { isdn_ctrl cmd; -@@ -114,7 +114,6 @@ +@@ -114,7 +114,6 @@ isdn_unlock_drivers(void) isdn_command(&cmd); dev->drv[i]->locks--; } @@ -14268,7 +14268,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c } void -@@ -473,6 +472,7 @@ +@@ -473,6 +472,7 @@ isdn_status_callback(isdn_ctrl * c) dev->drv[di]->flags &= ~DRV_FLAG_RUNNING; break; case ISDN_STAT_ICALL: @@ -14276,7 +14276,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c if (i < 0) return -1; #ifdef ISDN_DEBUG_STATCALLB -@@ -718,7 +718,9 @@ +@@ -718,7 +718,9 @@ isdn_status_callback(isdn_ctrl * c) dev->drvmap[i] = -1; dev->chanmap[i] = -1; dev->usage[i] &= ~ISDN_USAGE_DISABLED; @@ -14286,7 +14286,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c } dev->drivers--; dev->channels -= dev->drv[di]->channels; -@@ -755,6 +757,10 @@ +@@ -755,6 +757,10 @@ isdn_status_callback(isdn_ctrl * c) if (divert_if) return(divert_if->stat_callback(c)); #endif /* CONFIG_ISDN_DIVERSION */ @@ -14297,7 +14297,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c default: return -1; } -@@ -900,72 +906,239 @@ +@@ -900,72 +906,239 @@ isdn_minor2chan(int minor) return (dev->chanmap[minor]); } @@ -14576,7 +14576,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c static ssize_t isdn_read(struct file *file, char *buf, size_t count, loff_t * off) { -@@ -976,37 +1149,16 @@ +@@ -976,37 +1149,16 @@ isdn_read(struct file *file, char *buf, int chidx; int retval; char *p; @@ -14619,7 +14619,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c if (!dev->drivers) { retval = -ENODEV; goto out; -@@ -1031,7 +1183,7 @@ +@@ -1031,7 +1183,7 @@ isdn_read(struct file *file, char *buf, cli(); len = isdn_readbchan(drvidx, chidx, p, 0, count, &dev->drv[drvidx]->rcv_waitq[chidx]); @@ -14628,7 +14628,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c restore_flags(flags); if (copy_to_user(buf,p,len)) len = -EFAULT; -@@ -1052,6 +1204,9 @@ +@@ -1052,6 +1204,9 @@ isdn_read(struct file *file, char *buf, } interruptible_sleep_on(&(dev->drv[drvidx]->st_waitq)); } @@ -14638,7 +14638,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c if (dev->drv[drvidx]->interface->readstat) { if (count > dev->drv[drvidx]->stavail) count = dev->drv[drvidx]->stavail; -@@ -1065,6 +1220,9 @@ +@@ -1065,6 +1220,9 @@ isdn_read(struct file *file, char *buf, } else { len = 0; } @@ -14648,7 +14648,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c save_flags(flags); cli(); if (len) -@@ -1072,7 +1230,7 @@ +@@ -1072,7 +1230,7 @@ isdn_read(struct file *file, char *buf, else dev->drv[drvidx]->stavail = 0; restore_flags(flags); @@ -14657,7 +14657,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c retval = len; goto out; } -@@ -1084,7 +1242,9 @@ +@@ -1084,7 +1242,9 @@ isdn_read(struct file *file, char *buf, #endif retval = -ENODEV; out: @@ -14667,7 +14667,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c return retval; } -@@ -1096,15 +1256,18 @@ +@@ -1096,15 +1256,18 @@ isdn_write(struct file *file, const char int chidx; int retval; @@ -14688,7 +14688,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c if (minor <= ISDN_MINOR_BMAX) { printk(KERN_WARNING "isdn_write minor %d obsolete!\n", minor); drvidx = isdn_minor2drv(minor); -@@ -1149,7 +1312,9 @@ +@@ -1149,7 +1312,9 @@ isdn_write(struct file *file, const char #endif retval = -ENODEV; out: @@ -14698,7 +14698,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c return retval; } -@@ -1160,15 +1325,12 @@ +@@ -1160,15 +1325,12 @@ isdn_poll(struct file *file, poll_table unsigned int minor = MINOR(file->f_dentry->d_inode->i_rdev); int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL); @@ -14719,7 +14719,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c if (minor >= ISDN_MINOR_CTRL && minor <= ISDN_MINOR_CTRLMAX) { if (drvidx < 0) { /* driver deregistered while file open */ -@@ -1190,7 +1352,9 @@ +@@ -1190,7 +1352,9 @@ isdn_poll(struct file *file, poll_table #endif mask = POLLERR; out: @@ -14729,7 +14729,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c return mask; } -@@ -1220,42 +1384,9 @@ +@@ -1220,42 +1384,9 @@ isdn_ioctl(struct inode *inode, struct f #define phone iocpar.phone #define cfg iocpar.cfg @@ -14775,7 +14775,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c if (!dev->drivers) return -ENODEV; if (minor <= ISDN_MINOR_BMAX) { -@@ -1277,11 +1408,34 @@ +@@ -1277,11 +1408,34 @@ isdn_ioctl(struct inode *inode, struct f */ switch (cmd) { case IIOCNETDWRSET: @@ -14810,7 +14810,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c #ifdef CONFIG_NETDEVICES case IIOCNETAIF: /* Add a network-interface */ -@@ -1654,22 +1808,12 @@ +@@ -1654,22 +1808,12 @@ isdn_open(struct inode *ino, struct file int chidx; int retval = -ENODEV; @@ -14837,7 +14837,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c } if (!dev->channels) goto out; -@@ -1692,6 +1836,9 @@ +@@ -1692,6 +1836,9 @@ isdn_open(struct inode *ino, struct file if (drvidx < 0) goto out; isdn_lock_drivers(); @@ -14847,7 +14847,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c retval = 0; goto out; } -@@ -1704,6 +1851,10 @@ +@@ -1704,6 +1851,10 @@ isdn_open(struct inode *ino, struct file } #endif out: @@ -14858,7 +14858,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c return retval; } -@@ -1712,25 +1863,11 @@ +@@ -1712,25 +1863,11 @@ isdn_close(struct inode *ino, struct fil { uint minor = MINOR(ino->i_rdev); @@ -14887,7 +14887,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c } isdn_unlock_drivers(); if (minor <= ISDN_MINOR_BMAX) -@@ -1738,6 +1875,12 @@ +@@ -1738,6 +1875,12 @@ isdn_close(struct inode *ino, struct fil if (minor <= ISDN_MINOR_CTRLMAX) { if (dev->profd == current) dev->profd = NULL; @@ -14900,7 +14900,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c goto out; } #ifdef CONFIG_ISDN_PPP -@@ -1746,13 +1889,19 @@ +@@ -1746,13 +1889,19 @@ isdn_close(struct inode *ino, struct fil #endif out: @@ -14920,7 +14920,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c llseek: no_llseek, read: isdn_read, write: isdn_write, -@@ -1805,6 +1954,15 @@ +@@ -1805,6 +1954,15 @@ isdn_get_free_channel(int usage, int l2_ if (USG_NONE(dev->usage[i]) && (dev->drvmap[i] != -1)) { int d = dev->drvmap[i]; @@ -14936,7 +14936,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c if ((dev->usage[i] & ISDN_USAGE_EXCLUSIVE) && ((pre_dev != d) || (pre_chan != dev->chanmap[i]))) continue; -@@ -1823,7 +1981,11 @@ +@@ -1823,7 +1981,11 @@ isdn_get_free_channel(int usage, int l2_ restore_flags(flags); return i; } else { @@ -14948,7 +14948,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c dev->usage[i] &= ISDN_USAGE_EXCLUSIVE; dev->usage[i] |= usage; isdn_info_update(); -@@ -2010,7 +2172,7 @@ +@@ -2010,7 +2172,7 @@ isdn_add_channels(driver *d, int drvidx, if ((adding) && (d->rcverr)) kfree(d->rcverr); @@ -14957,7 +14957,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c printk(KERN_WARNING "register_isdn: Could not alloc rcverr\n"); return -1; } -@@ -2018,7 +2180,7 @@ +@@ -2018,7 +2180,7 @@ isdn_add_channels(driver *d, int drvidx, if ((adding) && (d->rcvcount)) kfree(d->rcvcount); @@ -14966,7 +14966,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c printk(KERN_WARNING "register_isdn: Could not alloc rcvcount\n"); if (!adding) kfree(d->rcverr); return -1; -@@ -2030,7 +2192,8 @@ +@@ -2030,7 +2192,8 @@ isdn_add_channels(driver *d, int drvidx, skb_queue_purge(&d->rpqueue[j]); kfree(d->rpqueue); } @@ -14976,7 +14976,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c printk(KERN_WARNING "register_isdn: Could not alloc rpqueue\n"); if (!adding) { kfree(d->rcvcount); -@@ -2044,7 +2207,8 @@ +@@ -2044,7 +2207,8 @@ isdn_add_channels(driver *d, int drvidx, if ((adding) && (d->rcv_waitq)) kfree(d->rcv_waitq); @@ -14986,7 +14986,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c if (!d->rcv_waitq) { printk(KERN_WARNING "register_isdn: Could not alloc rcv_waitq\n"); if (!adding) { -@@ -2068,7 +2232,9 @@ +@@ -2068,7 +2232,9 @@ isdn_add_channels(driver *d, int drvidx, if (dev->chanmap[k] < 0) { dev->chanmap[k] = j; dev->drvmap[k] = drvidx; @@ -14996,7 +14996,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c break; } restore_flags(flags); -@@ -2132,6 +2298,7 @@ +@@ -2132,6 +2298,7 @@ int DIVERT_REG_NAME(isdn_divert_if *i_di i_div->ll_cmd = isdn_command; /* set command function */ i_div->drv_to_name = map_drvname; i_div->name_to_drv = map_namedrv; @@ -15004,7 +15004,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c MOD_INC_USE_COUNT; divert_if = i_div; /* remember interface */ return(DIVERT_NO_ERR); -@@ -2169,7 +2336,7 @@ +@@ -2169,7 +2336,7 @@ register_isdn(isdn_if * i) printk(KERN_WARNING "register_isdn: No write routine given.\n"); return 0; } @@ -15013,7 +15013,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c printk(KERN_WARNING "register_isdn: Could not alloc driver-struct\n"); return 0; } -@@ -2229,6 +2396,7 @@ +@@ -2229,6 +2396,7 @@ isdn_getrev(const char *revision) return rev; } @@ -15021,7 +15021,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c #ifdef CONFIG_DEVFS_FS static devfs_handle_t devfs_handle; -@@ -2318,6 +2486,7 @@ +@@ -2318,6 +2486,7 @@ static void isdn_cleanup_devfs(void) } #endif /* CONFIG_DEVFS_FS */ @@ -15029,7 +15029,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c /* * Allocate and initialize all data, register modem-devices -@@ -2335,7 +2504,6 @@ +@@ -2335,7 +2504,6 @@ static int __init isdn_init(void) init_timer(&dev->timer); dev->timer.function = isdn_timer_funct; init_MUTEX(&dev->sem); @@ -15037,7 +15037,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c for (i = 0; i < ISDN_MAX_CHANNELS; i++) { dev->drvmap[i] = -1; dev->chanmap[i] = -1; -@@ -2349,7 +2517,9 @@ +@@ -2349,7 +2517,9 @@ static int __init isdn_init(void) vfree(dev); return -EIO; } @@ -15047,7 +15047,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c if ((i = isdn_tty_modem_init()) < 0) { printk(KERN_WARNING "isdn: Could not register tty devices\n"); if (i == -3) -@@ -2357,7 +2527,9 @@ +@@ -2357,7 +2527,9 @@ static int __init isdn_init(void) if (i <= -2) tty_unregister_driver(&dev->mdm.tty_modem); vfree(dev); @@ -15057,7 +15057,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c devfs_unregister_chrdev(ISDN_MAJOR, "isdn"); return -EIO; } -@@ -2368,7 +2540,9 @@ +@@ -2368,7 +2540,9 @@ static int __init isdn_init(void) tty_unregister_driver(&dev->mdm.cua_modem); for (i = 0; i < ISDN_MAX_CHANNELS; i++) kfree(dev->mdm.info[i].xmit_buf - 4); @@ -15067,7 +15067,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c devfs_unregister_chrdev(ISDN_MAJOR, "isdn"); vfree(dev); return -EIO; -@@ -2394,6 +2568,9 @@ +@@ -2394,6 +2568,9 @@ static int __init isdn_init(void) printk("\n"); #endif isdn_info_update(); @@ -15077,7 +15077,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c return 0; } -@@ -2402,7 +2579,7 @@ +@@ -2402,7 +2579,7 @@ static int __init isdn_init(void) */ static void __exit isdn_exit(void) { @@ -15086,7 +15086,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c int i; #ifdef CONFIG_ISDN_PPP -@@ -2436,13 +2613,18 @@ +@@ -2436,13 +2613,18 @@ static void __exit isdn_exit(void) printk(KERN_WARNING "isdn: controldevice busy, remove cancelled\n"); restore_flags(flags); } else { @@ -15107,8 +15107,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.c 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 2007-12-15 05:19:40.590734172 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_common.h 2007-12-15 05:19:55.687594492 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdn_common.h ++++ linux-2.4.35.4/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 $ @@ -15127,8 +15127,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_common.h 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 2007-12-15 05:19:40.598734627 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_concap.c 2007-12-15 05:19:55.687594492 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdn_concap.c ++++ linux-2.4.35.4/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 $ @@ -15137,8 +15137,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_concap.c * Index: linux-2.4.35.4/drivers/isdn/isdn_concap.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_concap.h 2007-12-15 05:19:40.606735085 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_concap.h 2007-12-15 05:19:55.687594492 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdn_concap.h ++++ linux-2.4.35.4/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 $ @@ -15147,8 +15147,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_concap.h * Index: linux-2.4.35.4/drivers/isdn/isdn_dwabc.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/isdn/isdn_dwabc.c 2007-12-15 05:19:55.695594949 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/isdn/isdn_dwabc.c @@ -0,0 +1,1053 @@ + +/* $Id: isdn_dwabc.c,v 1.27 2001/12/01 23:18:21 detabc Exp $ @@ -16205,8 +16205,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_dwabc.c +#endif Index: linux-2.4.35.4/drivers/isdn/isdn_net.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_net.c 2007-12-15 05:19:40.618735767 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_net.c 2007-12-15 05:19:55.699595179 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdn_net.c ++++ linux-2.4.35.4/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 $ @@ -16239,7 +16239,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c /* * Outline of new tbusy handling: -@@ -79,7 +75,11 @@ +@@ -79,7 +75,11 @@ static __inline__ int isdn_net_device_st dev = lp->master; else dev = &n->dev; @@ -16251,7 +16251,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c } /* -@@ -143,6 +143,10 @@ +@@ -143,6 +143,10 @@ static __inline__ void isdn_net_inc_fram atomic_inc(&lp->frame_cnt); if (isdn_net_device_busy(lp)) isdn_net_device_stop_queue(lp); @@ -16262,7 +16262,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c } static __inline__ void isdn_net_dec_frame_cnt(isdn_net_local *lp) -@@ -157,11 +161,19 @@ +@@ -157,11 +161,19 @@ static __inline__ void isdn_net_dec_fram isdn_net_device_wake_queue(lp); } } @@ -16282,7 +16282,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c } /* For 2.2.x we leave the transmitter busy timeout at 2 secs, just -@@ -173,23 +185,101 @@ +@@ -173,23 +185,101 @@ static __inline__ void isdn_net_zero_fra * which might rely on the tx timeout. If so, we'll find out this way... */ @@ -16385,7 +16385,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c isdn_net_unreachable(struct net_device *dev, struct sk_buff *skb, char *reason) { if(skb) { -@@ -297,6 +387,12 @@ +@@ -297,6 +387,12 @@ isdn_net_unbind_channel(isdn_net_local * save_flags(flags); cli(); @@ -16398,7 +16398,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c skb_queue_purge(&lp->super_tx_queue); if (!lp->master) { /* reset only master device */ -@@ -351,6 +447,26 @@ +@@ -351,6 +447,26 @@ isdn_net_autohup() if ((l->flags & ISDN_NET_CONNECTED) && (!l->dialstate)) { anymore = 1; l->huptimer++; @@ -16425,7 +16425,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c /* * if there is some dialmode where timeout-hangup * should _not_ be done, check for that here -@@ -465,8 +581,32 @@ +@@ -465,8 +581,32 @@ isdn_net_stat_callback(int idx, isdn_ctr printk(KERN_INFO "%s: Chargesum is %d\n", lp->name, lp->charge); isdn_net_unbind_channel(lp); @@ -16458,7 +16458,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c break; #ifdef CONFIG_ISDN_X25 case ISDN_STAT_BHUP: -@@ -507,6 +647,19 @@ +@@ -507,6 +647,19 @@ isdn_net_stat_callback(int idx, isdn_ctr } } printk(KERN_INFO "isdn_net: %s connected\n", lp->name); @@ -16478,7 +16478,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c /* If first Chargeinfo comes before B-Channel connect, * we correct the timestamp here. */ -@@ -578,7 +731,6 @@ +@@ -578,7 +731,6 @@ isdn_net_dial(void) int i; unsigned long flags; isdn_ctrl cmd; @@ -16486,7 +16486,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c while (p) { isdn_net_local *lp = p->local; -@@ -597,6 +749,47 @@ +@@ -597,6 +749,47 @@ isdn_net_dial(void) */ save_flags(flags); cli(); @@ -16534,7 +16534,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c lp->dial = lp->phone[1]; restore_flags(flags); if (!lp->dial) { -@@ -621,18 +814,69 @@ +@@ -621,18 +814,69 @@ isdn_net_dial(void) cmd.arg = lp->isdn_channel; cmd.command = ISDN_CMD_CLREAZ; isdn_command(&cmd); @@ -16604,7 +16604,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c if(dev->global_flags & ISDN_GLOBAL_STOPPED || (ISDN_NET_DIALMODE(*lp) == ISDN_NET_DM_OFF)) { char *s; if (dev->global_flags & ISDN_GLOBAL_STOPPED) -@@ -677,20 +921,7 @@ +@@ -677,20 +921,7 @@ isdn_net_dial(void) break; } @@ -16626,7 +16626,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c /* * Switch to next number or back to start if at end of list. */ -@@ -710,17 +941,70 @@ +@@ -710,17 +941,70 @@ isdn_net_dial(void) } } restore_flags(flags); @@ -16700,7 +16700,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c lp->dtimer = 0; #ifdef ISDN_DEBUG_NET_DIAL printk(KERN_DEBUG "dial: d=%d c=%d\n", lp->isdn_device, -@@ -741,6 +1025,10 @@ +@@ -741,6 +1025,10 @@ isdn_net_dial(void) lp->dialstate = (lp->cbdelay && (lp->flags & ISDN_NET_CBOUT)) ? 12 : 4; @@ -16711,7 +16711,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c break; case 4: /* Wait for D-Channel-connect. -@@ -890,6 +1178,15 @@ +@@ -890,6 +1178,15 @@ isdn_net_hangup(struct net_device *d) isdn_command(&cmd); printk(KERN_INFO "%s: Chargesum is %d\n", lp->name, lp->charge); isdn_all_eaz(lp->isdn_device, lp->isdn_channel); @@ -16727,7 +16727,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c } isdn_net_unbind_channel(lp); } -@@ -899,8 +1196,13 @@ +@@ -899,8 +1196,13 @@ typedef struct { unsigned short dest; } ip_ports; @@ -16741,7 +16741,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c { u_char *p = skb->nh.raw; /* hopefully, this was set correctly */ unsigned short proto = ntohs(skb->protocol); -@@ -972,7 +1274,13 @@ +@@ -972,7 +1274,13 @@ isdn_net_log_skb(struct sk_buff * skb, i break; } printk(KERN_INFO @@ -16755,7 +16755,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c p[12], p[13], p[14], p[15], p[16], p[17], p[18], p[19], -@@ -980,7 +1288,13 @@ +@@ -980,7 +1288,13 @@ isdn_net_log_skb(struct sk_buff * skb, i break; case ETH_P_ARP: printk(KERN_INFO @@ -16769,7 +16769,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c p[14], p[15], p[16], p[17], p[24], p[25], p[26], p[27]); break; -@@ -1004,11 +1318,22 @@ +@@ -1004,11 +1318,22 @@ void isdn_net_write_super(isdn_net_local } spin_lock_bh(&lp->xmit_lock); @@ -16795,7 +16795,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c spin_unlock_bh(&lp->xmit_lock); } -@@ -1056,7 +1381,6 @@ +@@ -1056,7 +1381,6 @@ void isdn_net_writebuf_skb(isdn_net_loca printk(KERN_WARNING "%s: HL driver queue full\n", lp->name); goto error; } @@ -16803,7 +16803,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c lp->transcount += len; isdn_net_inc_frame_cnt(lp); return; -@@ -1064,9 +1388,19 @@ +@@ -1064,9 +1388,19 @@ void isdn_net_writebuf_skb(isdn_net_loca error: dev_kfree_skb(skb); lp->stats.tx_errors++; @@ -16824,7 +16824,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c /* * Helper function for isdn_net_start_xmit. -@@ -1109,7 +1443,54 @@ +@@ -1109,7 +1443,54 @@ isdn_net_xmit(struct net_device *ndev, s /* Reset hangup-timeout */ lp->huptimer = 0; // FIXME? @@ -16879,7 +16879,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c spin_unlock_bh(&lp->xmit_lock); /* the following stuff is here for backwards compatibility. -@@ -1143,6 +1524,69 @@ +@@ -1143,6 +1524,69 @@ isdn_net_xmit(struct net_device *ndev, s return retv; @@ -16949,7 +16949,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c } static void -@@ -1161,6 +1605,7 @@ +@@ -1161,6 +1605,7 @@ isdn_net_adjust_hdr(struct sk_buff *skb, } @@ -16957,7 +16957,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c void isdn_net_tx_timeout(struct net_device * ndev) { isdn_net_local *lp = (isdn_net_local *) ndev->priv; -@@ -1188,19 +1633,206 @@ +@@ -1188,19 +1633,206 @@ void isdn_net_tx_timeout(struct net_devi ndev->trans_start = jiffies; netif_wake_queue(ndev); } @@ -17164,7 +17164,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c #ifdef CONFIG_ISDN_X25 /* At this point hard_start_xmit() passes control to the encapsulation protocol (if present). -@@ -1220,6 +1852,40 @@ +@@ -1220,6 +1852,40 @@ isdn_net_start_xmit(struct sk_buff *skb, } else #endif /* auto-dialing xmit function */ @@ -17205,7 +17205,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c { #ifdef ISDN_DEBUG_NET_DUMP u_char *buf; -@@ -1256,6 +1922,14 @@ +@@ -1256,6 +1922,14 @@ isdn_net_start_xmit(struct sk_buff *skb, } else lp->dialwait_timer = 0; } @@ -17220,7 +17220,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c /* Grab a free ISDN-Channel */ if (((chi = isdn_get_free_channel( -@@ -1264,6 +1938,9 @@ +@@ -1264,6 +1938,9 @@ isdn_net_start_xmit(struct sk_buff *skb, lp->l3_proto, lp->pre_device, lp->pre_channel, @@ -17230,7 +17230,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c lp->msn) ) < 0) && ((chi = -@@ -1273,6 +1950,9 @@ +@@ -1273,6 +1950,9 @@ isdn_net_start_xmit(struct sk_buff *skb, lp->l3_proto, lp->pre_device, lp->pre_channel^1, @@ -17240,7 +17240,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c lp->msn) ) < 0)) { restore_flags(flags); -@@ -1296,16 +1976,6 @@ +@@ -1296,16 +1976,6 @@ isdn_net_start_xmit(struct sk_buff *skb, restore_flags(flags); return 0; /* STN (skb to nirvana) ;) */ } @@ -17257,7 +17257,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c restore_flags(flags); isdn_net_dial(); /* Initiate dialing */ netif_stop_queue(ndev); -@@ -1337,6 +2007,7 @@ +@@ -1337,6 +2007,7 @@ isdn_net_start_xmit(struct sk_buff *skb, } } return 1; @@ -17265,7 +17265,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c } /* -@@ -1356,6 +2027,9 @@ +@@ -1356,6 +2027,9 @@ isdn_net_close(struct net_device *dev) if( cprot && cprot -> pops ) cprot -> pops -> close( cprot ); #endif netif_stop_queue(dev); @@ -17275,7 +17275,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c if ((p = (((isdn_net_local *) dev->priv)->slave))) { /* If this interface has slaves, stop them also */ while (p) { -@@ -1776,6 +2450,10 @@ +@@ -1776,6 +2450,10 @@ isdn_net_ciscohdlck_receive(isdn_net_loc } switch (type) { @@ -17286,7 +17286,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c case CISCO_TYPE_SLARP: isdn_net_ciscohdlck_slarp_in(lp, skb); goto out_free; -@@ -1785,11 +2463,11 @@ +@@ -1785,11 +2463,11 @@ isdn_net_ciscohdlck_receive(isdn_net_loc "\"no cdp enable\" on cisco.\n", lp->name); goto out_free; default: @@ -17302,7 +17302,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c out_free: kfree_skb(skb); -@@ -1803,9 +2481,19 @@ +@@ -1803,9 +2481,19 @@ isdn_net_receive(struct net_device *ndev { isdn_net_local *lp = (isdn_net_local *) ndev->priv; isdn_net_local *olp = lp; /* original 'lp' */ @@ -17322,7 +17322,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c lp->transcount += skb->len; lp->stats.rx_packets++; -@@ -1819,6 +2507,10 @@ +@@ -1819,6 +2507,10 @@ isdn_net_receive(struct net_device *ndev lp->stats.rx_packets++; lp->stats.rx_bytes += skb->len; } @@ -17333,7 +17333,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c skb->dev = ndev; skb->pkt_type = PACKET_HOST; skb->mac.raw = skb->data; -@@ -1840,9 +2532,40 @@ +@@ -1840,9 +2532,40 @@ isdn_net_receive(struct net_device *ndev /* Fall through */ case ISDN_NET_ENCAP_RAWIP: /* RAW-IP without MAC-Header */ @@ -17374,7 +17374,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c break; case ISDN_NET_ENCAP_CISCOHDLCK: isdn_net_ciscohdlck_receive(lp, skb); -@@ -1862,8 +2585,22 @@ +@@ -1862,8 +2585,22 @@ isdn_net_receive(struct net_device *ndev break; #ifdef CONFIG_ISDN_PPP case ISDN_NET_ENCAP_SYNCPPP: @@ -17398,7 +17398,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c return; #endif -@@ -1873,6 +2610,15 @@ +@@ -1873,6 +2610,15 @@ isdn_net_receive(struct net_device *ndev if(cprot) if(cprot -> pops) if( cprot -> pops -> data_ind){ cprot -> pops -> data_ind(cprot,skb); @@ -17414,7 +17414,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c return; }; #endif /* CONFIG_ISDN_X25 */ -@@ -1882,6 +2628,15 @@ +@@ -1882,6 +2628,15 @@ isdn_net_receive(struct net_device *ndev return; } @@ -17430,7 +17430,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c netif_rx(skb); return; } -@@ -2160,8 +2915,10 @@ +@@ -2160,8 +2915,10 @@ isdn_net_find_icall(int di, int ch, int isdn_net_phone *n; ulong flags; char nr[32]; @@ -17443,7 +17443,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c /* Search name in netdev-chain */ save_flags(flags); cli(); -@@ -2180,17 +2937,15 @@ +@@ -2180,17 +2937,15 @@ isdn_net_find_icall(int di, int ch, int eaz = setup->eazmsn; if (dev->net_verbose > 1) printk(KERN_INFO "isdn_net: call from %s,%d,%d -> %s\n", nr, si1, si2, eaz); @@ -17470,7 +17470,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c ematch = wret = swapped = 0; #ifdef ISDN_DEBUG_NET_ICALL printk(KERN_DEBUG "n_fi: di=%d ch=%d idx=%d usg=%d\n", di, ch, idx, -@@ -2210,25 +2965,8 @@ +@@ -2210,25 +2965,8 @@ p = dev->netdev; break; } swapped = 0; @@ -17498,7 +17498,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c /* Remember if more numbers eventually can match */ if (matchret > wret) wret = matchret; -@@ -2236,17 +2974,122 @@ +@@ -2236,17 +2974,122 @@ p = dev->netdev; printk(KERN_DEBUG "n_fi: if='%s', l.msn=%s, l.flags=%d, l.dstate=%d\n", lp->name, lp->msn, lp->flags, lp->dialstate); #endif @@ -17621,7 +17621,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c if (dev->usage[idx] & ISDN_USAGE_EXCLUSIVE) { if ((lp->pre_channel != ch) || (lp->pre_device != di)) { -@@ -2375,6 +3218,12 @@ +@@ -2375,6 +3218,12 @@ p = dev->netdev; continue; } } @@ -17634,7 +17634,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c if (lp->flags & ISDN_NET_CALLBACK) { int chi; /* -@@ -2427,6 +3276,47 @@ +@@ -2427,6 +3276,47 @@ p = dev->netdev; restore_flags(flags); return 0; } else { @@ -17682,7 +17682,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c printk(KERN_DEBUG "%s: call from %s -> %s accepted\n", lp->name, nr, eaz); /* if this interface is dialing, it does it probably on a different -@@ -2516,7 +3406,11 @@ +@@ -2516,7 +3406,11 @@ isdn_net_force_dial_lp(isdn_net_local * lp->l3_proto, lp->pre_device, lp->pre_channel, @@ -17694,7 +17694,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c ) < 0) { printk(KERN_WARNING "isdn_net_force_dial: No channel for %s\n", lp->name); restore_flags(flags); -@@ -2599,7 +3493,11 @@ +@@ -2599,7 +3493,11 @@ isdn_net_new(char *name, struct net_devi strcpy(netdev->local->name, " "); else strcpy(netdev->local->name, name); @@ -17706,7 +17706,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c netdev->dev.priv = netdev->local; netdev->dev.init = isdn_net_init; netdev->local->p_encap = ISDN_NET_ENCAP_RAWIP; -@@ -2617,11 +3515,13 @@ +@@ -2617,11 +3515,13 @@ isdn_net_new(char *name, struct net_devi ((isdn_net_local *) q->priv)->slave = &(netdev->dev); } else { /* Device shall be a master */ @@ -17720,7 +17720,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c if (register_netdev(&netdev->dev) != 0) { printk(KERN_WARNING "isdn_net: Could not register net-device\n"); kfree(netdev->local); -@@ -2658,6 +3558,9 @@ +@@ -2658,6 +3558,9 @@ isdn_net_new(char *name, struct net_devi netdev->local->hupflags = ISDN_INHUP; /* Do hangup even on incoming calls */ netdev->local->onhtime = 10; /* Default hangup-time for saving costs of those who forget configuring this */ @@ -17730,7 +17730,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c netdev->local->dialmax = 1; netdev->local->flags = ISDN_NET_CBHUP | ISDN_NET_DM_MANUAL; /* Hangup before Callback, manual dial */ netdev->local->cbdelay = 25; /* Wait 5 secs before Callback */ -@@ -2831,7 +3734,6 @@ +@@ -2831,7 +3734,6 @@ isdn_net_setcfg(isdn_net_ioctl_cfg * cfg /* If binding is exclusive, try to grab the channel */ save_flags(flags); @@ -17738,7 +17738,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c if ((i = isdn_get_free_channel(ISDN_USAGE_NET, lp->l2_proto, lp->l3_proto, drvidx, chidx, lp->msn)) < 0) { -@@ -2859,6 +3761,9 @@ +@@ -2859,6 +3761,9 @@ isdn_net_setcfg(isdn_net_ioctl_cfg * cfg lp->pre_device = drvidx; lp->pre_channel = chidx; lp->onhtime = cfg->onhtime; @@ -17748,7 +17748,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c lp->charge = cfg->charge; lp->l2_proto = cfg->l2_proto; lp->l3_proto = cfg->l3_proto; -@@ -2932,6 +3837,9 @@ +@@ -2932,6 +3837,9 @@ isdn_net_setcfg(isdn_net_ioctl_cfg * cfg } } lp->p_encap = cfg->p_encap; @@ -17758,7 +17758,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c return 0; } return -ENODEV; -@@ -3007,6 +3915,9 @@ +@@ -3007,6 +3915,9 @@ isdn_net_addphone(isdn_net_ioctl_phone * strcpy(n->num, phone->phone); n->next = p->local->phone[phone->outgoing & 1]; p->local->phone[phone->outgoing & 1] = n; @@ -17768,7 +17768,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c return 0; } return -ENODEV; -@@ -3100,6 +4011,9 @@ +@@ -3100,6 +4011,9 @@ isdn_net_delphone(isdn_net_ioctl_phone * else p->local->phone[inout] = n->next; kfree(n); @@ -17778,7 +17778,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c restore_flags(flags); return 0; } -@@ -3135,6 +4049,9 @@ +@@ -3135,6 +4049,9 @@ isdn_net_rmallphone(isdn_net_dev * p) p->local->phone[i] = NULL; } p->local->dial = NULL; @@ -17788,7 +17788,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c restore_flags(flags); return 0; } -@@ -3218,6 +4135,10 @@ +@@ -3218,6 +4135,10 @@ isdn_net_realrm(isdn_net_dev * p, isdn_n /* If no more net-devices remain, disable auto-hangup timer */ if (dev->netdev == NULL) isdn_timer_ctrl(ISDN_TIMER_NETHANGUP, 0); @@ -17801,8 +17801,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.c kfree(p); Index: linux-2.4.35.4/drivers/isdn/isdn_net.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_net.h 2007-12-15 05:19:40.626736225 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_net.h 2007-12-15 05:19:55.699595179 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdn_net.h ++++ linux-2.4.35.4/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 $ @@ -17817,7 +17817,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.h #define CISCO_TYPE_SLARP 0x8035 #define CISCO_SLARP_REQUEST 0 #define CISCO_SLARP_REPLY 1 -@@ -106,8 +107,6 @@ +@@ -106,8 +107,6 @@ static __inline__ void isdn_net_add_to_b spin_lock_irqsave(&nd->queue_lock, flags); lp = nd->queue; @@ -17826,7 +17826,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.h nlp->last = lp->last; lp->last->next = nlp; lp->last = nlp; -@@ -127,20 +126,12 @@ +@@ -127,20 +126,12 @@ static __inline__ void isdn_net_rm_from_ if (lp->master) master_lp = (isdn_net_local *) lp->master->priv; @@ -17850,8 +17850,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_net.h Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_ppp.c 2007-12-15 05:19:40.634736680 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_ppp.c 2007-12-15 05:19:55.703595405 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdn_ppp.c ++++ linux-2.4.35.4/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 $ @@ -17868,7 +17868,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c #include "isdn_common.h" #include "isdn_ppp.h" -@@ -72,11 +69,19 @@ +@@ -72,11 +69,19 @@ static void isdn_ppp_mp_cleanup( isdn_ne static int isdn_ppp_bundle(struct ippp_struct *, int unit); #endif /* CONFIG_ISDN_MPP */ @@ -17889,7 +17889,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c /* * frame log (debug) -@@ -110,11 +115,8 @@ +@@ -110,11 +115,8 @@ isdn_ppp_free(isdn_net_local * lp) unsigned long flags; struct ippp_struct *is; @@ -17902,7 +17902,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c save_flags(flags); cli(); -@@ -130,12 +132,7 @@ +@@ -130,12 +132,7 @@ isdn_ppp_free(isdn_net_local * lp) lp->netdev->pb->ref_ct--; spin_unlock(&lp->netdev->pb->lock); #endif /* CONFIG_ISDN_MPP */ @@ -17916,7 +17916,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c is = ippp_table[lp->ppp_slot]; if ((is->state & IPPP_CONNECT)) isdn_ppp_closewait(lp->ppp_slot); /* force wakeup on ippp device */ -@@ -231,13 +228,12 @@ +@@ -231,13 +228,12 @@ isdn_ppp_bind(isdn_net_local * lp) void isdn_ppp_wakeup_daemon(isdn_net_local * lp) { @@ -17934,7 +17934,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c } /* -@@ -250,14 +246,13 @@ +@@ -250,14 +246,13 @@ isdn_ppp_closewait(int slot) { struct ippp_struct *is; @@ -17952,7 +17952,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c is->state = IPPP_CLOSEWAIT; return 1; } -@@ -295,9 +290,11 @@ +@@ -295,9 +290,11 @@ isdn_ppp_open(int min, struct file *file return -EBUSY; } is = file->private_data = ippp_table[slot]; @@ -17967,7 +17967,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c /* compression stuff */ is->link_compressor = is->compressor = NULL; -@@ -327,10 +324,7 @@ +@@ -327,10 +324,7 @@ isdn_ppp_open(int min, struct file *file */ is->slcomp = slhc_init(16, 16); /* not necessary for 2. link in bundle */ #endif @@ -17979,7 +17979,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c is->state = IPPP_OPEN; return 0; -@@ -349,20 +343,12 @@ +@@ -349,20 +343,12 @@ isdn_ppp_release(int min, struct file *f return; is = file->private_data; @@ -18000,7 +18000,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c is->state &= ~IPPP_CONNECT; /* -> effect: no call of wakeup */ /* * isdn_net_hangup() calls isdn_ppp_free() -@@ -385,18 +371,8 @@ +@@ -385,18 +371,8 @@ isdn_ppp_release(int min, struct file *f slhc_free(is->slcomp); is->slcomp = NULL; #endif @@ -18020,7 +18020,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c if(is->comp_stat) is->compressor->free(is->comp_stat); if(is->link_comp_stat) -@@ -509,13 +485,15 @@ +@@ -509,13 +485,15 @@ isdn_ppp_ioctl(int min, struct file *fil if (val & SC_ENABLE_IP && !(is->pppcfg & SC_ENABLE_IP) && (is->state & IPPP_CONNECT)) { if (lp) { /* OK .. we are ready to send buffers */ @@ -18038,7 +18038,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c case PPPIOCGIDLE: /* get idle time information */ if (lp) { struct ppp_idle pidle; -@@ -604,39 +582,6 @@ +@@ -604,39 +582,6 @@ isdn_ppp_ioctl(int min, struct file *fil } return set_arg((void *)arg,&pci,sizeof(struct pppcallinfo)); } @@ -18078,7 +18078,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c default: break; } -@@ -699,7 +644,7 @@ +@@ -699,7 +644,7 @@ isdn_ppp_fill_rq(unsigned char *buf, int struct ippp_struct *is; if (slot < 0 || slot >= ISDN_MAX_CHANNELS) { @@ -18087,7 +18087,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c return 0; } is = ippp_table[slot]; -@@ -976,8 +921,7 @@ +@@ -976,8 +921,7 @@ void isdn_ppp_receive(isdn_net_dev * net slot = lp->ppp_slot; if (slot < 0 || slot > ISDN_MAX_CHANNELS) { @@ -18097,7 +18097,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c kfree_skb(skb); return; } -@@ -1026,23 +970,19 @@ +@@ -1026,23 +970,19 @@ isdn_ppp_push_higher(isdn_net_dev * net_ { struct net_device *dev = &net_dev->dev; struct ippp_struct *is, *mis; @@ -18124,7 +18124,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c goto drop_packet; } } -@@ -1076,11 +1016,6 @@ +@@ -1076,11 +1016,6 @@ isdn_ppp_push_higher(isdn_net_dev * net_ case PPP_VJC_UNCOMP: if (is->debug & 0x20) printk(KERN_DEBUG "isdn_ppp: VJC_UNCOMP\n"); @@ -18136,7 +18136,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c if (slhc_remember(ippp_table[net_dev->local->ppp_slot]->slcomp, skb->data, skb->len) <= 0) { printk(KERN_WARNING "isdn_ppp: received illegal VJC_UNCOMP frame!\n"); goto drop_packet; -@@ -1102,11 +1037,6 @@ +@@ -1102,11 +1037,6 @@ isdn_ppp_push_higher(isdn_net_dev * net_ } skb_put(skb, skb_old->len + 128); memcpy(skb->data, skb_old->data, skb_old->len); @@ -18148,7 +18148,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c pkt_len = slhc_uncompress(ippp_table[net_dev->local->ppp_slot]->slcomp, skb->data, skb_old->len); kfree_skb(skb_old); -@@ -1133,36 +1063,12 @@ +@@ -1133,36 +1063,12 @@ isdn_ppp_push_higher(isdn_net_dev * net_ return; } @@ -18191,7 +18191,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c skb->dev = dev; skb->mac.raw = skb->data; netif_rx(skb); -@@ -1199,6 +1105,7 @@ +@@ -1199,6 +1105,7 @@ static unsigned char *isdn_ppp_skb_push( return skb_push(skb,len); } @@ -18199,7 +18199,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c /* * send ppp frame .. we expect a PIDCOMPressable proto -- * (here: currently always PPP_IP,PPP_VJC_COMP,PPP_VJC_UNCOMP) -@@ -1214,25 +1121,23 @@ +@@ -1214,25 +1121,23 @@ isdn_ppp_xmit(struct sk_buff *skb, struc isdn_net_dev *nd; unsigned int proto = PPP_IP; /* 0x21 */ struct ippp_struct *ipt,*ipts; @@ -18229,7 +18229,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c } switch (ntohs(skb->protocol)) { -@@ -1246,25 +1151,24 @@ +@@ -1246,25 +1151,24 @@ isdn_ppp_xmit(struct sk_buff *skb, struc printk(KERN_ERR "isdn_ppp: skipped unsupported protocol: %#x.\n", skb->protocol); dev_kfree_skb(skb); @@ -18260,7 +18260,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c /* * after this line .. requeueing in the device queue is no longer allowed!!! -@@ -1275,34 +1179,6 @@ +@@ -1275,34 +1179,6 @@ isdn_ppp_xmit(struct sk_buff *skb, struc */ skb_pull(skb,IPPP_MAX_HEADER); @@ -18295,7 +18295,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c if (ipt->debug & 0x4) printk(KERN_DEBUG "xmit skb, len %d\n", (int) skb->len); if (ipts->debug & 0x40) -@@ -1440,54 +1316,9 @@ +@@ -1440,54 +1316,9 @@ isdn_ppp_xmit(struct sk_buff *skb, struc unlock: spin_unlock_bh(&lp->xmit_lock); @@ -18351,7 +18351,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c #ifdef CONFIG_ISDN_MPP /* this is _not_ rfc1990 header, but something we convert both short and long -@@ -1537,15 +1368,8 @@ +@@ -1537,15 +1368,8 @@ static ippp_bundle * isdn_ppp_mp_bundle_ static int isdn_ppp_mp_init( isdn_net_local * lp, ippp_bundle * add_to ) { @@ -18369,7 +18369,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c if (add_to) { if( lp->netdev->pb ) lp->netdev->pb->ref_ct--; -@@ -1591,8 +1415,7 @@ +@@ -1591,8 +1415,7 @@ static void isdn_ppp_mp_receive(isdn_net stats = &mp->stats; slot = lp->ppp_slot; if (slot < 0 || slot > ISDN_MAX_CHANNELS) { @@ -18379,7 +18379,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c stats->frame_drops++; dev_kfree_skb(skb); spin_unlock_irqrestore(&mp->lock, flags); -@@ -1628,8 +1451,7 @@ +@@ -1628,8 +1451,7 @@ static void isdn_ppp_mp_receive(isdn_net for (lpq = net_dev->queue;;) { slot = lpq->ppp_slot; if (slot < 0 || slot > ISDN_MAX_CHANNELS) { @@ -18389,7 +18389,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c } else { u32 lls = ippp_table[slot]->last_link_seqno; if (MP_LT(lls, minseq)) -@@ -1861,14 +1683,9 @@ +@@ -1861,14 +1683,9 @@ void isdn_ppp_mp_reassembly( isdn_net_de struct sk_buff * skb; unsigned int tot_len; @@ -18405,7 +18405,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c "len %d\n", MP_SEQ(from), from->len ); skb = from; skb_pull(skb, MP_HEADER_LEN); -@@ -1987,10 +1804,8 @@ +@@ -1987,10 +1804,8 @@ isdn_ppp_dev_ioctl_stats(int slot, struc memset(&t, 0, sizeof(struct ppp_stats)); if (dev->flags & IFF_UP) { t.p.ppp_ipackets = lp->stats.rx_packets; @@ -18416,7 +18416,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c t.p.ppp_oerrors = lp->stats.tx_errors; #ifdef CONFIG_ISDN_PPP_VJ if (slot >= 0 && ippp_table[slot]->slcomp) { -@@ -2018,6 +1833,9 @@ +@@ -2018,6 +1833,9 @@ isdn_ppp_dev_ioctl(struct net_device *de int len; isdn_net_local *lp = (isdn_net_local *) dev->priv; @@ -18426,7 +18426,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c if (lp->p_encap != ISDN_NET_ENCAP_SYNCPPP) return -EINVAL; -@@ -2432,7 +2250,7 @@ +@@ -2432,7 +2250,7 @@ static void isdn_ppp_ccp_reset_trans(str return; } rs->state = CCPResetSentReq; @@ -18435,7 +18435,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c know better */ rs->expra = 1; rs->dlen = 0; -@@ -2583,7 +2401,13 @@ +@@ -2583,7 +2401,13 @@ static struct sk_buff *isdn_ppp_compress } if(type) { /* type=1 => Link compression */ @@ -18449,7 +18449,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c } else { if(!master) { -@@ -2631,31 +2455,18 @@ +@@ -2631,31 +2455,18 @@ static struct sk_buff *isdn_ppp_compress static void isdn_ppp_receive_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, struct sk_buff *skb,int proto) { @@ -18486,7 +18486,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c mis = is; switch(skb->data[0]) { -@@ -2807,18 +2618,13 @@ +@@ -2807,18 +2618,13 @@ static void isdn_ppp_receive_ccp(isdn_ne static void isdn_ppp_send_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, struct sk_buff *skb) { @@ -18508,7 +18508,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c /* Daemon may send with or without address and control field comp */ data = skb->data; if(!(is->pppcfg & SC_COMP_AC) && data[0] == 0xff && data[1] == 0x03) { -@@ -2834,17 +2640,12 @@ +@@ -2834,17 +2640,12 @@ static void isdn_ppp_send_ccp(isdn_net_d printk(KERN_DEBUG "Received CCP frame from daemon:\n"); isdn_ppp_frame_log("ccp-xmit", skb->data, skb->len, 32, is->unit,lp->ppp_slot); @@ -18534,15 +18534,15 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.c 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 2007-12-15 05:19:40.642737136 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_ppp.h 2007-12-15 05:19:55.703595405 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdn_ppp.h ++++ linux-2.4.35.4/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 $ * * header for Linux ISDN subsystem, functions for synchronous PPP (linklevel). * -@@ -19,7 +19,6 @@ +@@ -19,7 +19,6 @@ extern int isdn_ppp_init(void); extern void isdn_ppp_cleanup(void); extern int isdn_ppp_free(isdn_net_local *); extern int isdn_ppp_bind(isdn_net_local *); @@ -18552,15 +18552,15 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ppp.h 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 2007-12-15 05:19:40.646737365 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_tty.c 2007-12-15 05:19:55.703595405 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdn_tty.c ++++ linux-2.4.35.4/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 $ * * Linux ISDN subsystem, tty functions and AT-command emulator (linklevel). * -@@ -53,7 +53,7 @@ +@@ -53,7 +53,7 @@ static int bit2si[8] = static int si2bit[8] = {4, 1, 4, 4, 4, 4, 4, 4}; @@ -18569,7 +18569,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_tty.c /* isdn_tty_try_read() is called from within isdn_tty_rcv_skb() -@@ -321,7 +321,10 @@ +@@ -321,7 +321,10 @@ isdn_tty_tint(modem_info * info) info->send_outstanding++; info->msr &= ~UART_MSR_CTS; info->lsr &= ~UART_LSR_TEMT; @@ -18581,7 +18581,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_tty.c return; } if (slen < 0) { -@@ -1211,7 +1214,10 @@ +@@ -1211,7 +1214,10 @@ isdn_tty_write(struct tty_struct *tty, i /* If DLE decoding results in zero-transmit, but * c originally was non-zero, do a wakeup. */ @@ -18593,7 +18593,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_tty.c info->msr |= UART_MSR_CTS; info->lsr |= UART_LSR_TEMT; } -@@ -1232,6 +1238,7 @@ +@@ -1232,6 +1238,7 @@ isdn_tty_write(struct tty_struct *tty, i } } } else @@ -18601,7 +18601,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_tty.c if (TTY_IS_FCLASS1(info)) { int cc = isdn_tty_handleDLEdown(info, m, c); -@@ -1252,6 +1259,7 @@ +@@ -1252,6 +1259,7 @@ isdn_tty_write(struct tty_struct *tty, i info->xmit_count += cc; } else #endif @@ -18609,7 +18609,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_tty.c info->xmit_count += c; } else { info->msr |= UART_MSR_CTS; -@@ -1329,7 +1337,10 @@ +@@ -1329,7 +1337,10 @@ isdn_tty_flush_buffer(struct tty_struct isdn_tty_cleanup_xmit(info); info->xmit_count = 0; restore_flags(flags); @@ -18621,7 +18621,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_tty.c } static void -@@ -1858,7 +1869,8 @@ +@@ -1858,7 +1869,8 @@ isdn_tty_close(struct tty_struct *tty, s isdn_tty_shutdown(info); if (tty->driver.flush_buffer) tty->driver.flush_buffer(tty); @@ -18631,7 +18631,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_tty.c info->tty = 0; info->ncarrier = 0; tty->closing = 0; -@@ -2306,6 +2318,22 @@ +@@ -2306,6 +2318,22 @@ isdn_tty_stat_callback(int i, isdn_ctrl isdn_tty_at_cout("\r\n", info); } return 1; @@ -18654,7 +18654,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_tty.c case ISDN_STAT_DCONN: #ifdef ISDN_TTY_STAT_DEBUG printk(KERN_DEBUG "tty_STAT_DCONN ttyI%d\n", info->line); -@@ -2618,7 +2646,7 @@ +@@ -2618,7 +2646,7 @@ isdn_tty_modem_result(int code, modem_in static char *msg[] = {"OK", "CONNECT", "RING", "NO CARRIER", "ERROR", "CONNECT 64000", "NO DIALTONE", "BUSY", "NO ANSWER", @@ -18663,7 +18663,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_tty.c ulong flags; char s[ISDN_MSNLEN+10]; -@@ -2781,7 +2809,8 @@ +@@ -2781,7 +2809,8 @@ isdn_tty_modem_result(int code, modem_in restore_flags(flags); return; } @@ -18673,7 +18673,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_tty.c if ((info->flags & ISDN_ASYNC_CHECK_CD) && (!((info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) && (info->flags & ISDN_ASYNC_CALLOUT_NOHUP)))) { -@@ -3296,9 +3325,11 @@ +@@ -3296,9 +3325,11 @@ isdn_tty_cmd_PLUSF(char **p, modem_info #ifdef CONFIG_ISDN_TTY_FAX if (TTY_IS_FCLASS2(info)) sprintf(rs, "\r\n2"); @@ -18685,7 +18685,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_tty.c isdn_tty_at_cout(rs, info); break; case '=': -@@ -3313,6 +3344,7 @@ +@@ -3313,6 +3344,7 @@ isdn_tty_cmd_PLUSF(char **p, modem_info m->mdmreg[REG_PSIZE] * 16; break; #ifdef CONFIG_ISDN_TTY_FAX @@ -18693,7 +18693,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_tty.c case '1': p[0]++; if (!(dev->global_features & -@@ -3324,6 +3356,7 @@ +@@ -3324,6 +3356,7 @@ isdn_tty_cmd_PLUSF(char **p, modem_info info->xmit_size = m->mdmreg[REG_PSIZE] * 16; break; @@ -18701,7 +18701,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_tty.c case '2': p[0]++; if (!(dev->global_features & -@@ -3348,9 +3381,11 @@ +@@ -3348,9 +3381,11 @@ isdn_tty_cmd_PLUSF(char **p, modem_info p[0]++; strcpy(rs, "\r\n0,"); #ifdef CONFIG_ISDN_TTY_FAX @@ -18715,8 +18715,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_tty.c 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 2007-12-15 05:19:40.654737820 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_tty.h 2007-12-15 05:19:55.707595631 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdn_tty.h ++++ linux-2.4.35.4/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 $ @@ -18750,8 +18750,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_tty.h (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 2007-12-15 05:19:40.662738275 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_ttyfax.c 2007-12-15 05:19:55.711595860 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdn_ttyfax.c ++++ linux-2.4.35.4/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 $ @@ -18767,7 +18767,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.c #define PARSE_ERROR1 { isdn_tty_fax_modem_result(1, info); return 1; } -@@ -148,6 +148,7 @@ +@@ -148,6 +148,7 @@ isdn_tty_fax_modem_result(int code, mode } } @@ -18775,7 +18775,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.c int isdn_tty_fax_command1(modem_info * info, isdn_ctrl * c) { -@@ -186,6 +187,7 @@ +@@ -186,6 +187,7 @@ isdn_tty_fax_command1(modem_info * info, } return (0); } @@ -18783,7 +18783,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.c int isdn_tty_fax_command(modem_info * info, isdn_ctrl * c) -@@ -193,8 +195,10 @@ +@@ -193,8 +195,10 @@ isdn_tty_fax_command(modem_info * info, T30_s *f = info->fax; char rs[10]; @@ -18794,7 +18794,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.c #ifdef ISDN_TTY_FAX_CMD_DEBUG printk(KERN_DEBUG "isdn_tty: Fax cmd %d on ttyI%d\n", -@@ -312,6 +316,7 @@ +@@ -312,6 +316,7 @@ isdn_tty_fax_bitorder(modem_info * info, } } @@ -18802,7 +18802,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.c /* * Parse AT+F.. FAX class 1 commands */ -@@ -403,6 +408,7 @@ +@@ -403,6 +408,7 @@ isdn_tty_cmd_FCLASS1(char **p, modem_inf } return 1; } @@ -18810,7 +18810,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.c /* * Parse AT+F.. FAX class 2 commands -@@ -970,6 +976,70 @@ +@@ -970,6 +976,70 @@ isdn_tty_cmd_FCLASS2(char **p, modem_inf } return 0; } @@ -18881,7 +18881,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.c /* MDL? - DCE Model */ if (!strncmp(p[0], "MDL?", 4)) { -@@ -1049,6 +1119,38 @@ +@@ -1049,6 +1119,38 @@ isdn_tty_cmd_FCLASS2(char **p, modem_inf } return 0; } @@ -18920,7 +18920,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.c /* REL=n - Phase C received EOL alignment */ if (!strncmp(p[0], "REL", 3)) { -@@ -1091,6 +1193,38 @@ +@@ -1091,6 +1193,38 @@ isdn_tty_cmd_FCLASS2(char **p, modem_inf isdn_tty_at_cout(rs, info); return 0; } @@ -18959,7 +18959,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.c /* Phase C Transmit Data Block Size */ if (!strncmp(p[0], "TBC=", 4)) { /* dummy, not used */ -@@ -1116,7 +1250,9 @@ +@@ -1116,7 +1250,9 @@ isdn_tty_cmd_PLUSF_FAX(char **p, modem_i { if (TTY_IS_FCLASS2(info)) return (isdn_tty_cmd_FCLASS2(p, info)); @@ -18971,8 +18971,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.c } Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_ttyfax.h 2007-12-15 05:19:40.670738731 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_ttyfax.h 2007-12-15 05:19:55.711595860 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdn_ttyfax.h ++++ linux-2.4.35.4/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 $ @@ -18981,8 +18981,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_ttyfax.h * Index: linux-2.4.35.4/drivers/isdn/isdn_v110.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_v110.c 2007-12-15 05:19:40.678739186 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_v110.c 2007-12-15 05:19:55.711595860 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdn_v110.c ++++ linux-2.4.35.4/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 $ @@ -18998,7 +18998,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_v110.c #define V110_38400 255 #define V110_19200 15 -@@ -138,6 +138,14 @@ +@@ -138,6 +138,14 @@ isdn_v110_close(isdn_v110_stream * v) return; #ifdef ISDN_V110_DEBUG printk(KERN_DEBUG "v110 close\n"); @@ -19015,8 +19015,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_v110.c kfree(v); Index: linux-2.4.35.4/drivers/isdn/isdn_v110.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_v110.h 2007-12-15 05:19:40.686739644 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_v110.h 2007-12-15 05:19:55.715596089 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdn_v110.h ++++ linux-2.4.35.4/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 $ @@ -19025,8 +19025,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_v110.h * Index: linux-2.4.35.4/drivers/isdn/isdn_x25iface.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_x25iface.c 2007-12-15 05:19:40.694740100 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_x25iface.c 2007-12-15 05:19:55.715596089 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdn_x25iface.c ++++ linux-2.4.35.4/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 $ @@ -19035,8 +19035,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_x25iface.c * Index: linux-2.4.35.4/drivers/isdn/isdn_x25iface.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdn_x25iface.h 2007-12-15 05:19:40.702740555 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdn_x25iface.h 2007-12-15 05:19:55.715596089 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdn_x25iface.h ++++ linux-2.4.35.4/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 $ @@ -19045,8 +19045,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdn_x25iface.h * Index: linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/isdnloop/isdnloop.c 2007-12-15 05:19:40.706740784 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.c 2007-12-15 05:19:55.715596089 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdnloop/isdnloop.c ++++ linux-2.4.35.4/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 $ @@ -19062,7 +19062,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.c static char *isdnloop_id; MODULE_DESCRIPTION("ISDN4Linux: Pseudo Driver that simulates an ISDN card"); -@@ -22,8 +22,8 @@ +@@ -22,8 +22,8 @@ MODULE_AUTHOR("Fritz Elfert"); MODULE_LICENSE("GPL"); MODULE_PARM(isdnloop_id, "s"); MODULE_PARM_DESC(isdnloop_id, "ID-String of first card"); @@ -19073,7 +19073,7 @@ Index: linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.c /* * Free queue completely. -@@ -1542,11 +1542,7 @@ +@@ -1542,11 +1542,7 @@ isdnloop_init(void) } else strcpy(rev, " ??? "); printk(KERN_NOTICE "isdnloop-ISDN-driver Rev%s\n", rev); @@ -19088,8 +19088,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.c 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 2007-12-15 05:19:40.714741240 +0100 -+++ linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.h 2007-12-15 05:19:55.719596319 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/isdnloop/isdnloop.h ++++ linux-2.4.35.4/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$ @@ -19098,8 +19098,8 @@ Index: linux-2.4.35.4/drivers/isdn/isdnloop/isdnloop.h * Index: linux-2.4.35.4/drivers/isdn/pcbit/callbacks.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/pcbit/callbacks.c 2007-12-15 05:19:40.722741695 +0100 -+++ linux-2.4.35.4/drivers/isdn/pcbit/callbacks.c 2007-12-15 05:19:55.719596319 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/pcbit/callbacks.c ++++ linux-2.4.35.4/drivers/isdn/pcbit/callbacks.c @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19111,8 +19111,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/callbacks.c * 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 2007-12-15 05:19:40.730742150 +0100 -+++ linux-2.4.35.4/drivers/isdn/pcbit/callbacks.h 2007-12-15 05:19:55.719596319 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/pcbit/callbacks.h ++++ linux-2.4.35.4/drivers/isdn/pcbit/callbacks.h @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19124,8 +19124,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/callbacks.h * 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 2007-12-15 05:19:40.738742606 +0100 -+++ linux-2.4.35.4/drivers/isdn/pcbit/capi.c 2007-12-15 05:19:55.719596319 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/pcbit/capi.c ++++ linux-2.4.35.4/drivers/isdn/pcbit/capi.c @@ -4,7 +4,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19137,8 +19137,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/capi.c * 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 2007-12-15 05:19:40.746743064 +0100 -+++ linux-2.4.35.4/drivers/isdn/pcbit/capi.h 2007-12-15 05:19:55.719596319 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/pcbit/capi.h ++++ linux-2.4.35.4/drivers/isdn/pcbit/capi.h @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19148,7 +19148,7 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/capi.h * * This software may be used and distributed according to the terms of * the GNU General Public License, incorporated herein by reference. -@@ -63,7 +63,8 @@ +@@ -63,7 +63,8 @@ extern int capi_disc_resp(struct pcbit_c extern int capi_decode_debug_188(u_char *hdr, ushort hdrlen); #endif @@ -19160,8 +19160,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/capi.h ushort callref; Index: linux-2.4.35.4/drivers/isdn/pcbit/drv.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/pcbit/drv.c 2007-12-15 05:19:40.754743519 +0100 -+++ linux-2.4.35.4/drivers/isdn/pcbit/drv.c 2007-12-15 05:19:55.723596545 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/pcbit/drv.c ++++ linux-2.4.35.4/drivers/isdn/pcbit/drv.c @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19181,7 +19181,7 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/drv.c #include "pcbit.h" #include "edss1.h" -@@ -89,6 +91,7 @@ +@@ -89,6 +91,7 @@ int pcbit_init_dev(int board, int mem_ba if (mem_base >= 0xA0000 && mem_base <= 0xFFFFF ) { dev->ph_mem = mem_base; @@ -19189,7 +19189,7 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/drv.c if (check_mem_region(dev->ph_mem, 4096)) { printk(KERN_WARNING "PCBIT: memory region %lx-%lx already in use\n", -@@ -100,6 +103,9 @@ +@@ -100,6 +103,9 @@ int pcbit_init_dev(int board, int mem_ba request_mem_region(dev->ph_mem, 4096, "PCBIT mem"); } dev->sh_mem = (unsigned char*)ioremap(dev->ph_mem, 4096); @@ -19199,7 +19199,7 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/drv.c } else { -@@ -112,8 +118,10 @@ +@@ -112,8 +118,10 @@ int pcbit_init_dev(int board, int mem_ba dev->b1 = kmalloc(sizeof(struct pcbit_chan), GFP_KERNEL); if (!dev->b1) { printk("pcbit_init: couldn't malloc pcbit_chan struct\n"); @@ -19210,7 +19210,7 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/drv.c kfree(dev); return -ENOMEM; } -@@ -122,8 +130,10 @@ +@@ -122,8 +130,10 @@ int pcbit_init_dev(int board, int mem_ba if (!dev->b2) { printk("pcbit_init: couldn't malloc pcbit_chan struct\n"); kfree(dev->b1); @@ -19221,7 +19221,7 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/drv.c kfree(dev); return -ENOMEM; } -@@ -144,8 +154,10 @@ +@@ -144,8 +154,10 @@ int pcbit_init_dev(int board, int mem_ba { kfree(dev->b1); kfree(dev->b2); @@ -19232,7 +19232,7 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/drv.c kfree(dev); dev_pcbit[board] = NULL; return -EIO; -@@ -166,8 +178,10 @@ +@@ -166,8 +178,10 @@ int pcbit_init_dev(int board, int mem_ba free_irq(irq, dev); kfree(dev->b1); kfree(dev->b2); @@ -19243,7 +19243,7 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/drv.c kfree(dev); dev_pcbit[board] = NULL; return -EIO; -@@ -197,8 +211,10 @@ +@@ -197,8 +211,10 @@ int pcbit_init_dev(int board, int mem_ba free_irq(irq, dev); kfree(dev->b1); kfree(dev->b2); @@ -19254,7 +19254,7 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/drv.c kfree(dev); dev_pcbit[board] = NULL; return -EIO; -@@ -235,8 +251,10 @@ +@@ -235,8 +251,10 @@ void pcbit_terminate(int board) del_timer(&dev->b2->fsm_timer); kfree(dev->b1); kfree(dev->b2); @@ -19265,7 +19265,7 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/drv.c kfree(dev); } } -@@ -430,7 +448,7 @@ +@@ -430,7 +448,7 @@ int pcbit_writecmd(const u_char* buf, in switch(dev->l2_state) { case L2_LWMODE: /* check (size <= rdp_size); write buf into board */ @@ -19274,7 +19274,7 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/drv.c { printk("pcbit_writecmd: invalid length %d\n", len); return -EINVAL; -@@ -609,6 +627,20 @@ +@@ -609,6 +627,20 @@ void pcbit_l3_receive(struct pcbit_dev * dev->b1->s_refnum, dev->b2->s_refnum); #endif @@ -19295,7 +19295,7 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/drv.c /* We just try to find a channel in the right state */ if (dev->b1->fsm_state == ST_CALL_INIT) -@@ -622,6 +654,7 @@ +@@ -622,6 +654,7 @@ void pcbit_l3_receive(struct pcbit_dev * break; } } @@ -19305,8 +19305,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/drv.c 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 2007-12-15 05:19:40.762743974 +0100 -+++ linux-2.4.35.4/drivers/isdn/pcbit/edss1.c 2007-12-15 05:19:55.723596545 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/pcbit/edss1.c ++++ linux-2.4.35.4/drivers/isdn/pcbit/edss1.c @@ -4,7 +4,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19318,8 +19318,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/edss1.c * 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 2007-12-15 05:19:40.770744430 +0100 -+++ linux-2.4.35.4/drivers/isdn/pcbit/edss1.h 2007-12-15 05:19:55.723596545 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/pcbit/edss1.h ++++ linux-2.4.35.4/drivers/isdn/pcbit/edss1.h @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19331,8 +19331,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/edss1.h * 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 2007-12-15 05:19:40.774744659 +0100 -+++ linux-2.4.35.4/drivers/isdn/pcbit/layer2.c 2007-12-15 05:19:55.723596545 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/pcbit/layer2.c ++++ linux-2.4.35.4/drivers/isdn/pcbit/layer2.c @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19342,7 +19342,7 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/layer2.c * * This software may be used and distributed according to the terms of * the GNU General Public License, incorporated herein by reference. -@@ -369,11 +369,16 @@ +@@ -369,11 +369,16 @@ pcbit_receive(struct pcbit_dev *dev) if (dev->read_frame) { printk(KERN_DEBUG "pcbit_receive: Type 0 frame and read_frame != NULL\n"); @@ -19359,7 +19359,7 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/layer2.c } frame = kmalloc(sizeof(struct frame_buf), GFP_ATOMIC); -@@ -449,10 +454,14 @@ +@@ -449,10 +454,14 @@ pcbit_receive(struct pcbit_dev *dev) if (!(frame = dev->read_frame)) { printk("Type 1 frame and no frame queued\n"); @@ -19376,8 +19376,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/layer2.c } Index: linux-2.4.35.4/drivers/isdn/pcbit/layer2.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/pcbit/layer2.h 2007-12-15 05:19:40.782745114 +0100 -+++ linux-2.4.35.4/drivers/isdn/pcbit/layer2.h 2007-12-15 05:19:55.731597000 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/pcbit/layer2.h ++++ linux-2.4.35.4/drivers/isdn/pcbit/layer2.h @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19389,8 +19389,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/layer2.h * 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 2007-12-15 05:19:40.790745570 +0100 -+++ linux-2.4.35.4/drivers/isdn/pcbit/module.c 2007-12-15 05:19:55.731597000 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/pcbit/module.c ++++ linux-2.4.35.4/drivers/isdn/pcbit/module.c @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19400,7 +19400,7 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/module.c * * This software may be used and distributed according to the terms of * the GNU General Public License, incorporated herein by reference. -@@ -92,6 +92,7 @@ +@@ -92,6 +92,7 @@ static void __exit pcbit_exit(void) } #ifndef MODULE @@ -19408,7 +19408,7 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/module.c #define MAX_PARA (MAX_PCBIT_CARDS * 2) static int __init pcbit_setup(char *line) { -@@ -100,6 +101,11 @@ +@@ -100,6 +101,11 @@ static int __init pcbit_setup(char *line int ints[MAX_PARA+1]; str = get_options(line, MAX_PARA, ints); @@ -19420,7 +19420,7 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/module.c argc = ints[0]; i = 0; j = 1; -@@ -118,9 +124,13 @@ +@@ -118,9 +124,13 @@ static int __init pcbit_setup(char *line i++; } @@ -19436,8 +19436,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/module.c 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 2007-12-15 05:19:40.798746025 +0100 -+++ linux-2.4.35.4/drivers/isdn/pcbit/pcbit.h 2007-12-15 05:19:55.731597000 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/pcbit/pcbit.h ++++ linux-2.4.35.4/drivers/isdn/pcbit/pcbit.h @@ -3,7 +3,7 @@ * * Copyright (C) 1996 Universidade de Lisboa @@ -19449,8 +19449,8 @@ Index: linux-2.4.35.4/drivers/isdn/pcbit/pcbit.h * 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 2007-12-15 05:19:40.806746483 +0100 -+++ linux-2.4.35.4/drivers/isdn/sc/card.h 2007-12-15 05:19:55.731597000 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/sc/card.h ++++ linux-2.4.35.4/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$ @@ -19459,15 +19459,15 @@ Index: linux-2.4.35.4/drivers/isdn/sc/card.h * Index: linux-2.4.35.4/drivers/isdn/sc/command.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/command.c 2007-12-15 05:19:40.814746939 +0100 -+++ linux-2.4.35.4/drivers/isdn/sc/command.c 2007-12-15 05:19:55.735597229 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/sc/command.c ++++ linux-2.4.35.4/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$ * * Copyright (C) 1996 SpellCaster Telecommunications Inc. * -@@ -95,7 +95,7 @@ +@@ -95,7 +95,7 @@ int get_card_from_id(int driver) if(adapter[i]->driverId == driver) return i; } @@ -19478,8 +19478,8 @@ Index: linux-2.4.35.4/drivers/isdn/sc/command.c /* Index: linux-2.4.35.4/drivers/isdn/sc/debug.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/debug.c 2007-12-15 05:19:40.822747394 +0100 -+++ linux-2.4.35.4/drivers/isdn/sc/debug.c 2007-12-15 05:19:55.735597229 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/sc/debug.c ++++ linux-2.4.35.4/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$ @@ -19488,8 +19488,8 @@ Index: linux-2.4.35.4/drivers/isdn/sc/debug.c * Index: linux-2.4.35.4/drivers/isdn/sc/debug.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/debug.h 2007-12-15 05:19:40.830747849 +0100 -+++ linux-2.4.35.4/drivers/isdn/sc/debug.h 2007-12-15 05:19:55.735597229 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/sc/debug.h ++++ linux-2.4.35.4/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$ @@ -19498,8 +19498,8 @@ Index: linux-2.4.35.4/drivers/isdn/sc/debug.h * Index: linux-2.4.35.4/drivers/isdn/sc/event.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/event.c 2007-12-15 05:19:40.838748305 +0100 -+++ linux-2.4.35.4/drivers/isdn/sc/event.c 2007-12-15 05:19:55.735597229 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/sc/event.c ++++ linux-2.4.35.4/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$ @@ -19508,9 +19508,9 @@ Index: linux-2.4.35.4/drivers/isdn/sc/event.c * Index: linux-2.4.35.4/drivers/isdn/sc/init.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/init.c 2007-12-15 05:19:40.846748763 +0100 -+++ linux-2.4.35.4/drivers/isdn/sc/init.c 2007-12-15 05:19:55.735597229 +0100 -@@ -514,6 +514,15 @@ +--- linux-2.4.35.4.orig/drivers/isdn/sc/init.c ++++ linux-2.4.35.4/drivers/isdn/sc/init.c +@@ -514,6 +514,15 @@ int identify_board(unsigned long rambase schedule_timeout(HZ); sig = readl(rambase + SIG_OFFSET); pr_debug("Looking for a signature, got 0x%x\n", sig); @@ -19526,7 +19526,7 @@ Index: linux-2.4.35.4/drivers/isdn/sc/init.c if(sig == SIGNATURE) return PRI_BOARD; -@@ -525,6 +534,9 @@ +@@ -525,6 +534,9 @@ int identify_board(unsigned long rambase schedule_timeout(HZ); sig = readl(rambase + SIG_OFFSET); pr_debug("Looking for a signature, got 0x%x\n", sig); @@ -19538,8 +19538,8 @@ Index: linux-2.4.35.4/drivers/isdn/sc/init.c Index: linux-2.4.35.4/drivers/isdn/sc/interrupt.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/interrupt.c 2007-12-15 05:19:40.850748989 +0100 -+++ linux-2.4.35.4/drivers/isdn/sc/interrupt.c 2007-12-15 05:19:55.739597458 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/sc/interrupt.c ++++ linux-2.4.35.4/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$ @@ -19548,9 +19548,9 @@ Index: linux-2.4.35.4/drivers/isdn/sc/interrupt.c * Index: linux-2.4.35.4/drivers/isdn/sc/ioctl.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/ioctl.c 2007-12-15 05:19:40.858749445 +0100 -+++ linux-2.4.35.4/drivers/isdn/sc/ioctl.c 2007-12-15 05:19:55.739597458 +0100 -@@ -23,6 +23,9 @@ +--- linux-2.4.35.4.orig/drivers/isdn/sc/ioctl.c ++++ linux-2.4.35.4/drivers/isdn/sc/ioctl.c +@@ -23,6 +23,9 @@ extern int send_and_receive(int, unsigne extern board *adapter[]; @@ -19562,8 +19562,8 @@ Index: linux-2.4.35.4/drivers/isdn/sc/ioctl.c Index: linux-2.4.35.4/drivers/isdn/sc/message.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/message.c 2007-12-15 05:19:40.866749903 +0100 -+++ linux-2.4.35.4/drivers/isdn/sc/message.c 2007-12-15 05:19:55.739597458 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/sc/message.c ++++ linux-2.4.35.4/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$ @@ -19572,8 +19572,8 @@ Index: linux-2.4.35.4/drivers/isdn/sc/message.c * Index: linux-2.4.35.4/drivers/isdn/sc/message.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/message.h 2007-12-15 05:19:40.874750358 +0100 -+++ linux-2.4.35.4/drivers/isdn/sc/message.h 2007-12-15 05:19:55.739597458 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/sc/message.h ++++ linux-2.4.35.4/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$ @@ -19582,8 +19582,8 @@ Index: linux-2.4.35.4/drivers/isdn/sc/message.h * Index: linux-2.4.35.4/drivers/isdn/sc/packet.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/packet.c 2007-12-15 05:19:40.882750813 +0100 -+++ linux-2.4.35.4/drivers/isdn/sc/packet.c 2007-12-15 05:19:55.739597458 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/sc/packet.c ++++ linux-2.4.35.4/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$ @@ -19592,8 +19592,8 @@ Index: linux-2.4.35.4/drivers/isdn/sc/packet.c * Index: linux-2.4.35.4/drivers/isdn/sc/shmem.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/shmem.c 2007-12-15 05:19:40.890751269 +0100 -+++ linux-2.4.35.4/drivers/isdn/sc/shmem.c 2007-12-15 05:19:55.743597685 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/sc/shmem.c ++++ linux-2.4.35.4/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$ @@ -19602,8 +19602,8 @@ Index: linux-2.4.35.4/drivers/isdn/sc/shmem.c * Index: linux-2.4.35.4/drivers/isdn/sc/timer.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/sc/timer.c 2007-12-15 05:19:40.898751724 +0100 -+++ linux-2.4.35.4/drivers/isdn/sc/timer.c 2007-12-15 05:19:55.743597685 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/sc/timer.c ++++ linux-2.4.35.4/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$ @@ -19612,8 +19612,8 @@ Index: linux-2.4.35.4/drivers/isdn/sc/timer.c * Index: linux-2.4.35.4/drivers/isdn/tpam/tpam.h =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam.h 2007-12-15 05:19:40.906752182 +0100 -+++ linux-2.4.35.4/drivers/isdn/tpam/tpam.h 2007-12-15 05:19:55.743597685 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam.h ++++ linux-2.4.35.4/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 $ @@ -19622,8 +19622,8 @@ Index: linux-2.4.35.4/drivers/isdn/tpam/tpam.h * Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_commands.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_commands.c 2007-12-15 05:19:40.914752638 +0100 -+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_commands.c 2007-12-15 05:19:55.743597685 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_commands.c ++++ linux-2.4.35.4/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 $ @@ -19632,8 +19632,8 @@ Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_commands.c * Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_crcpc.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_crcpc.c 2007-12-15 05:19:40.922753093 +0100 -+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_crcpc.c 2007-12-15 05:19:55.747597911 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_crcpc.c ++++ linux-2.4.35.4/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$ @@ -19642,8 +19642,8 @@ Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_crcpc.c * Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_hdlc.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_hdlc.c 2007-12-15 05:19:40.926753322 +0100 -+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_hdlc.c 2007-12-15 05:19:55.747597911 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_hdlc.c ++++ linux-2.4.35.4/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 $ @@ -19652,15 +19652,15 @@ Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_hdlc.c * Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_main.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_main.c 2007-12-15 05:19:40.934753777 +0100 -+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_main.c 2007-12-15 05:19:55.747597911 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_main.c ++++ linux-2.4.35.4/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$ * * Turbo PAM ISDN driver for Linux. (Kernel Driver - main routines) * -@@ -254,7 +254,7 @@ +@@ -254,7 +254,7 @@ static struct pci_driver tpam_driver = { name: "tpam", id_table: tpam_pci_tbl, probe: tpam_probe, @@ -19671,8 +19671,8 @@ Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_main.c 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 2007-12-15 05:19:40.942754233 +0100 -+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_memory.c 2007-12-15 05:19:55.747597911 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_memory.c ++++ linux-2.4.35.4/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$ @@ -19681,8 +19681,8 @@ Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_memory.c * Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_nco.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_nco.c 2007-12-15 05:19:40.950754688 +0100 -+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_nco.c 2007-12-15 05:19:55.751598140 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_nco.c ++++ linux-2.4.35.4/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$ @@ -19691,15 +19691,15 @@ Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_nco.c * (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 2007-12-15 05:19:40.962755372 +0100 -+++ linux-2.4.35.4/drivers/isdn/tpam/tpam_queues.c 2007-12-15 05:19:55.751598140 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/tpam/tpam_queues.c ++++ linux-2.4.35.4/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$ * * Turbo PAM ISDN driver for Linux. (Kernel Driver) * -@@ -146,7 +146,6 @@ +@@ -146,7 +146,6 @@ void tpam_irq(int irq, void *dev_id, str do { hpic = readl(card->bar0 + TPAM_HPIC_REGISTER); if (waiting_too_long++ > 0xfffffff) { @@ -19709,8 +19709,8 @@ Index: linux-2.4.35.4/drivers/isdn/tpam/tpam_queues.c "waiting too long...\n"); Index: linux-2.4.35.4/include/linux/b1lli.h =================================================================== ---- linux-2.4.35.4.orig/include/linux/b1lli.h 2007-12-15 05:19:40.966755602 +0100 -+++ linux-2.4.35.4/include/linux/b1lli.h 2007-12-15 05:19:55.751598140 +0100 +--- linux-2.4.35.4.orig/include/linux/b1lli.h ++++ linux-2.4.35.4/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$ @@ -19719,8 +19719,8 @@ Index: linux-2.4.35.4/include/linux/b1lli.h * Index: linux-2.4.35.4/include/linux/b1pcmcia.h =================================================================== ---- linux-2.4.35.4.orig/include/linux/b1pcmcia.h 2007-12-15 05:19:40.974756057 +0100 -+++ linux-2.4.35.4/include/linux/b1pcmcia.h 2007-12-15 05:19:55.751598140 +0100 +--- linux-2.4.35.4.orig/include/linux/b1pcmcia.h ++++ linux-2.4.35.4/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$ @@ -19729,8 +19729,8 @@ Index: linux-2.4.35.4/include/linux/b1pcmcia.h * 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 2007-12-15 05:19:40.982756512 +0100 -+++ linux-2.4.35.4/include/linux/capi.h 2007-12-15 05:19:55.751598140 +0100 +--- linux-2.4.35.4.orig/include/linux/capi.h ++++ linux-2.4.35.4/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$ @@ -19739,8 +19739,8 @@ Index: linux-2.4.35.4/include/linux/capi.h * Index: linux-2.4.35.4/include/linux/concap.h =================================================================== ---- linux-2.4.35.4.orig/include/linux/concap.h 2007-12-15 05:19:40.990756968 +0100 -+++ linux-2.4.35.4/include/linux/concap.h 2007-12-15 05:19:55.755598369 +0100 +--- linux-2.4.35.4.orig/include/linux/concap.h ++++ linux-2.4.35.4/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 $ @@ -19757,8 +19757,8 @@ Index: linux-2.4.35.4/include/linux/concap.h 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 2007-12-15 05:19:40.998757423 +0100 -+++ linux-2.4.35.4/include/linux/hysdn_if.h 2007-12-15 05:19:55.755598369 +0100 +--- linux-2.4.35.4.orig/include/linux/hysdn_if.h ++++ linux-2.4.35.4/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$ @@ -19767,8 +19767,8 @@ Index: linux-2.4.35.4/include/linux/hysdn_if.h * 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 2007-12-15 05:19:41.006757881 +0100 -+++ linux-2.4.35.4/include/linux/isdn/tpam.h 2007-12-15 05:19:55.755598369 +0100 +--- linux-2.4.35.4.orig/include/linux/isdn/tpam.h ++++ linux-2.4.35.4/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$ @@ -19777,8 +19777,8 @@ Index: linux-2.4.35.4/include/linux/isdn/tpam.h * Index: linux-2.4.35.4/include/linux/isdn.h =================================================================== ---- linux-2.4.35.4.orig/include/linux/isdn.h 2007-12-15 05:19:41.014758337 +0100 -+++ linux-2.4.35.4/include/linux/isdn.h 2007-12-15 05:19:55.755598369 +0100 +--- linux-2.4.35.4.orig/include/linux/isdn.h ++++ linux-2.4.35.4/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 $ @@ -19809,7 +19809,7 @@ Index: linux-2.4.35.4/include/linux/isdn.h #define INF_DV 0x01 /* Data version for /dev/isdninfo */ -@@ -187,6 +194,61 @@ +@@ -187,6 +194,61 @@ typedef struct { #define ISDN_MINOR_PPPMAX (128 + (ISDN_MAX_CHANNELS-1)) #define ISDN_MINOR_STATUS 255 @@ -19871,7 +19871,7 @@ Index: linux-2.4.35.4/include/linux/isdn.h #ifdef CONFIG_ISDN_PPP #ifdef CONFIG_ISDN_PPP_VJ -@@ -204,9 +266,11 @@ +@@ -204,9 +266,11 @@ typedef struct { # include <linux/concap.h> #endif @@ -19883,7 +19883,7 @@ Index: linux-2.4.35.4/include/linux/isdn.h #include <linux/isdnif.h> -@@ -272,6 +336,12 @@ +@@ -272,6 +336,12 @@ typedef struct { #define ISDN_NET_CALLBACK 0x04 /* activate callback */ #define ISDN_NET_CBHUP 0x08 /* hangup before callback */ #define ISDN_NET_CBOUT 0x10 /* remote machine does callback */ @@ -19896,7 +19896,7 @@ Index: linux-2.4.35.4/include/linux/isdn.h #define ISDN_NET_MAGIC 0x49344C02 /* for paranoia-checking */ -@@ -386,6 +456,38 @@ +@@ -386,6 +456,38 @@ typedef struct isdn_net_local_s { char cisco_debserint; /* debugging flag of cisco hdlc with slarp */ struct timer_list cisco_timer; struct tq_struct tqueue; @@ -19935,7 +19935,7 @@ Index: linux-2.4.35.4/include/linux/isdn.h } isdn_net_local; /* the interface itself */ -@@ -608,12 +710,13 @@ +@@ -608,12 +710,13 @@ typedef struct isdn_devt { int tflags; /* Timer-Flags: */ /* see ISDN_TIMER_..defines */ int global_flags; @@ -19951,7 +19951,7 @@ Index: linux-2.4.35.4/include/linux/isdn.h char num[ISDN_MAX_CHANNELS][ISDN_MSNLEN]; /* Remote number of active ch.*/ int m_idx[ISDN_MAX_CHANNELS]; /* Index for mdm.... */ -@@ -631,6 +734,7 @@ +@@ -631,6 +734,7 @@ typedef struct isdn_devt { isdn_v110_stream *v110[ISDN_MAX_CHANNELS]; /* V.110 private data */ struct semaphore sem; /* serialize list access*/ unsigned long global_features; @@ -19959,7 +19959,7 @@ Index: linux-2.4.35.4/include/linux/isdn.h #ifdef CONFIG_DEVFS_FS devfs_handle_t devfs_handle_isdninfo; devfs_handle_t devfs_handle_isdnctrl; -@@ -640,10 +744,41 @@ +@@ -640,10 +744,41 @@ typedef struct isdn_devt { devfs_handle_t devfs_handle_ipppX[ISDN_MAX_CHANNELS]; #endif #endif /* CONFIG_DEVFS_FS */ @@ -20003,8 +20003,8 @@ Index: linux-2.4.35.4/include/linux/isdn.h Index: linux-2.4.35.4/include/linux/isdn_compat.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/isdn_compat.h 2007-12-15 05:19:55.755598369 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/isdn_compat.h @@ -0,0 +1,261 @@ +/* $Id: isdn_compat.h,v 1.53 2001/09/24 13:23:13 kai Exp $ + * @@ -20269,8 +20269,8 @@ Index: linux-2.4.35.4/include/linux/isdn_compat.h +#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 2007-12-15 05:19:41.026759021 +0100 -+++ linux-2.4.35.4/include/linux/isdn_divertif.h 2007-12-15 05:19:55.759598598 +0100 +--- linux-2.4.35.4.orig/include/linux/isdn_divertif.h ++++ linux-2.4.35.4/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$ @@ -20286,7 +20286,7 @@ Index: linux-2.4.35.4/include/linux/isdn_divertif.h #define DIVERT_CMD_REG 0x00 /* register command */ #define DIVERT_CMD_REL 0x01 /* release command */ #define DIVERT_NO_ERR 0x00 /* return value no error */ -@@ -34,6 +34,7 @@ +@@ -34,6 +34,7 @@ typedef struct int (*ll_cmd)(isdn_ctrl *); /* supplied by hl on return */ char * (*drv_to_name)(int); /* map a driver id to name, supplied by hl */ int (*name_to_drv)(char *); /* map a driver id to name, supplied by hl */ @@ -20296,8 +20296,8 @@ Index: linux-2.4.35.4/include/linux/isdn_divertif.h /*********************/ Index: linux-2.4.35.4/include/linux/isdn_dwabc.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/isdn_dwabc.h 2007-12-15 05:19:55.759598598 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/isdn_dwabc.h @@ -0,0 +1,84 @@ +/* $Id: isdn_dwabc.h,v 1.9 2001/09/26 20:32:08 detabc Exp $ + * @@ -20385,8 +20385,8 @@ Index: linux-2.4.35.4/include/linux/isdn_dwabc.h +#endif Index: linux-2.4.35.4/include/linux/isdn_lzscomp.h =================================================================== ---- linux-2.4.35.4.orig/include/linux/isdn_lzscomp.h 2007-12-15 05:19:41.042759932 +0100 -+++ linux-2.4.35.4/include/linux/isdn_lzscomp.h 2007-12-15 05:19:55.759598598 +0100 +--- linux-2.4.35.4.orig/include/linux/isdn_lzscomp.h ++++ linux-2.4.35.4/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$ @@ -20395,8 +20395,8 @@ Index: linux-2.4.35.4/include/linux/isdn_lzscomp.h * 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 2007-12-15 05:19:41.046760161 +0100 -+++ linux-2.4.35.4/include/linux/isdn_ppp.h 2007-12-15 05:19:55.759598598 +0100 +--- linux-2.4.35.4.orig/include/linux/isdn_ppp.h ++++ linux-2.4.35.4/include/linux/isdn_ppp.h @@ -8,6 +8,7 @@ #ifndef _LINUX_ISDN_PPP_H #define _LINUX_ISDN_PPP_H @@ -20405,7 +20405,7 @@ Index: linux-2.4.35.4/include/linux/isdn_ppp.h #define CALLTYPE_INCOMING 0x1 #define CALLTYPE_OUTGOING 0x2 -@@ -33,6 +34,11 @@ +@@ -33,6 +34,11 @@ struct pppcallinfo #define PPPIOCSCOMPRESSOR _IOW('t',135,int) #define PPPIOCGIFNAME _IOR('t',136, char [IFNAMSIZ] ) @@ -20417,7 +20417,7 @@ Index: linux-2.4.35.4/include/linux/isdn_ppp.h #define SC_MP_PROT 0x00000200 #define SC_REJ_MP_PROT 0x00000400 -@@ -65,9 +71,6 @@ +@@ -65,9 +71,6 @@ struct isdn_ppp_comp_data { #include <linux/config.h> @@ -20427,7 +20427,7 @@ Index: linux-2.4.35.4/include/linux/isdn_ppp.h #define DECOMP_ERR_NOMEM (-10) -@@ -226,10 +229,6 @@ +@@ -226,10 +229,6 @@ struct ippp_struct { unsigned char *cbuf; struct slcompress *slcomp; #endif @@ -20440,8 +20440,8 @@ Index: linux-2.4.35.4/include/linux/isdn_ppp.h 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 2007-12-15 05:19:41.054760616 +0100 -+++ linux-2.4.35.4/include/linux/isdnif.h 2007-12-15 05:19:55.759598598 +0100 +--- linux-2.4.35.4.orig/include/linux/isdnif.h ++++ linux-2.4.35.4/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 $ @@ -20456,7 +20456,7 @@ Index: linux-2.4.35.4/include/linux/isdnif.h /* * Values for general protocol-selection -@@ -213,6 +214,8 @@ +@@ -213,6 +214,8 @@ typedef struct #define ISDN_STAT_FAXIND 276 /* FAX indications from HL-driver */ #define ISDN_STAT_AUDIO 277 /* DTMF, DSP indications */ #define ISDN_STAT_DISCH 278 /* Disable/Enable channel usage */ @@ -20467,8 +20467,8 @@ Index: linux-2.4.35.4/include/linux/isdnif.h * Audio commands Index: linux-2.4.35.4/include/linux/kernelcapi.h =================================================================== ---- linux-2.4.35.4.orig/include/linux/kernelcapi.h 2007-12-15 05:19:41.066761301 +0100 -+++ linux-2.4.35.4/include/linux/kernelcapi.h 2007-12-15 05:19:55.759598598 +0100 +--- linux-2.4.35.4.orig/include/linux/kernelcapi.h ++++ linux-2.4.35.4/include/linux/kernelcapi.h @@ -1,12 +1,10 @@ -/* $Id: kernelcapi.h,v 1.1.4.2 2002/01/28 18:25:10 kai Exp $ +/* diff --git a/target/linux/generic-2.4/patches/201-hfc_usb_backport.patch b/target/linux/generic-2.4/patches/201-hfc_usb_backport.patch index 302f6bbee3..af084d8197 100644 --- a/target/linux/generic-2.4/patches/201-hfc_usb_backport.patch +++ b/target/linux/generic-2.4/patches/201-hfc_usb_backport.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/drivers/Makefile =================================================================== ---- linux-2.4.35.4.orig/drivers/Makefile 2007-12-15 05:19:39.306660996 +0100 -+++ linux-2.4.35.4/drivers/Makefile 2007-12-15 05:19:59.111789629 +0100 -@@ -38,7 +38,7 @@ +--- linux-2.4.35.4.orig/drivers/Makefile ++++ linux-2.4.35.4/drivers/Makefile +@@ -38,7 +38,7 @@ subdir-$(CONFIG_FUSION) += message/fusi subdir-$(CONFIG_MD) += md subdir-$(CONFIG_IEEE1394) += ieee1394 subdir-$(CONFIG_PNP) += pnp @@ -13,8 +13,8 @@ Index: linux-2.4.35.4/drivers/Makefile Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c =================================================================== ---- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_usb.c 2007-12-15 05:19:55.575588111 +0100 -+++ linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c 2007-12-15 05:19:59.115789855 +0100 +--- linux-2.4.35.4.orig/drivers/isdn/hisax/hfc_usb.c ++++ linux-2.4.35.4/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 $ +/* @@ -477,7 +477,7 @@ Index: linux-2.4.35.4/drivers/isdn/hisax/hfc_usb.c } } /* ctrl_start_transfer */ -@@ -293,897 +275,1418 @@ +@@ -293,897 +275,1418 @@ ctrl_start_transfer(hfcusb_data * hfc) /* queue a control transfer request */ /* return 0 on success. */ /************************************/ diff --git a/target/linux/generic-2.4/patches/202-pl2303_backport.patch b/target/linux/generic-2.4/patches/202-pl2303_backport.patch index c01f0aad1b..7c5b5ebaee 100644 --- a/target/linux/generic-2.4/patches/202-pl2303_backport.patch +++ b/target/linux/generic-2.4/patches/202-pl2303_backport.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/drivers/usb/serial/pl2303.c =================================================================== ---- linux-2.4.35.4.orig/drivers/usb/serial/pl2303.c 2007-12-15 05:19:39.266658716 +0100 -+++ linux-2.4.35.4/drivers/usb/serial/pl2303.c 2007-12-15 05:19:59.351803306 +0100 -@@ -78,6 +78,11 @@ +--- linux-2.4.35.4.orig/drivers/usb/serial/pl2303.c ++++ linux-2.4.35.4/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) }, { USB_DEVICE(SITECOM_VENDOR_ID, SITECOM_PRODUCT_ID) }, @@ -16,8 +16,8 @@ Index: linux-2.4.35.4/drivers/usb/serial/pl2303.c Index: linux-2.4.35.4/drivers/usb/serial/pl2303.h =================================================================== ---- linux-2.4.35.4.orig/drivers/usb/serial/pl2303.h 2007-12-15 05:19:39.278659401 +0100 -+++ linux-2.4.35.4/drivers/usb/serial/pl2303.h 2007-12-15 05:19:59.355803533 +0100 +--- linux-2.4.35.4.orig/drivers/usb/serial/pl2303.h ++++ linux-2.4.35.4/drivers/usb/serial/pl2303.h @@ -41,3 +41,21 @@ #define SITECOM_VENDOR_ID 0x6189 diff --git a/target/linux/generic-2.4/patches/203-hfsplus_fix.patch b/target/linux/generic-2.4/patches/203-hfsplus_fix.patch index edec21a891..23fcca49a9 100644 --- a/target/linux/generic-2.4/patches/203-hfsplus_fix.patch +++ b/target/linux/generic-2.4/patches/203-hfsplus_fix.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/fs/hfsplus/super.c =================================================================== ---- linux-2.4.35.4.orig/fs/hfsplus/super.c 2007-12-15 05:19:39.238657121 +0100 -+++ linux-2.4.35.4/fs/hfsplus/super.c 2007-12-15 05:19:59.575816071 +0100 -@@ -240,8 +240,7 @@ +--- linux-2.4.35.4.orig/fs/hfsplus/super.c ++++ linux-2.4.35.4/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; @@ -12,7 +12,7 @@ Index: linux-2.4.35.4/fs/hfsplus/super.c printk("HFS+-fs warning: Filesystem was not cleanly unmounted, " "running fsck.hfsplus is recommended. leaving read-only.\n"); sb->s_flags |= MS_RDONLY; -@@ -343,8 +342,7 @@ +@@ -343,8 +342,7 @@ static int hfsplus_fill_super(struct sup /* Set up operations so we can load metadata */ sb->s_op = &hfsplus_sops; diff --git a/target/linux/generic-2.4/patches/206-gcc_3.4_fixes.patch b/target/linux/generic-2.4/patches/206-gcc_3.4_fixes.patch index 10b7448c72..a73be75a76 100644 --- a/target/linux/generic-2.4/patches/206-gcc_3.4_fixes.patch +++ b/target/linux/generic-2.4/patches/206-gcc_3.4_fixes.patch @@ -1,7 +1,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/signal.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips/kernel/signal.c 2007-12-15 05:19:39.146651877 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/signal.c 2007-12-15 05:19:59.787828152 +0100 +--- linux-2.4.35.4.orig/arch/mips/kernel/signal.c ++++ linux-2.4.35.4/arch/mips/kernel/signal.c @@ -6,8 +6,10 @@ * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 1994 - 1999 Ralf Baechle @@ -13,7 +13,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/signal.c #include <linux/sched.h> #include <linux/mm.h> #include <linux/smp.h> -@@ -76,7 +78,9 @@ +@@ -76,7 +78,9 @@ int copy_siginfo_to_user(siginfo_t *to, * Atomically swap in the new signal mask, and wait for a signal. */ save_static_function(sys_sigsuspend); @@ -24,7 +24,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/signal.c { sigset_t *uset, saveset, newset; -@@ -102,7 +106,9 @@ +@@ -102,7 +106,9 @@ static_unused int _sys_sigsuspend(struct } save_static_function(sys_rt_sigsuspend); @@ -37,8 +37,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/signal.c 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 2007-12-15 05:19:39.154652335 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/syscall.c 2007-12-15 05:19:59.795828608 +0100 +--- linux-2.4.35.4.orig/arch/mips/kernel/syscall.c ++++ linux-2.4.35.4/arch/mips/kernel/syscall.c @@ -5,6 +5,7 @@ * * Copyright (C) 1995 - 2000 by Ralf Baechle @@ -47,7 +47,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/syscall.c * * TODO: Implement the compatibility syscalls. * Don't waste that much memory for empty entries in the syscall -@@ -158,7 +159,9 @@ +@@ -158,7 +159,9 @@ sys_mmap2(unsigned long addr, unsigned l } save_static_function(sys_fork); @@ -58,7 +58,7 @@ Index: linux-2.4.35.4/arch/mips/kernel/syscall.c { int res; -@@ -168,7 +171,9 @@ +@@ -168,7 +171,9 @@ static_unused int _sys_fork(struct pt_re save_static_function(sys_clone); @@ -71,9 +71,9 @@ Index: linux-2.4.35.4/arch/mips/kernel/syscall.c 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 2007-12-15 05:19:39.162652791 +0100 -+++ linux-2.4.35.4/arch/mips/ld.script.in 2007-12-15 05:19:59.799828834 +0100 -@@ -9,6 +9,7 @@ +--- linux-2.4.35.4.orig/arch/mips/ld.script.in ++++ linux-2.4.35.4/arch/mips/ld.script.in +@@ -9,6 +9,7 @@ SECTIONS { _ftext = . ; *(.text) @@ -83,8 +83,8 @@ Index: linux-2.4.35.4/arch/mips/ld.script.in *(.rodata1) Index: linux-2.4.35.4/arch/mips64/kernel/signal.c =================================================================== ---- linux-2.4.35.4.orig/arch/mips64/kernel/signal.c 2007-12-15 05:19:39.170653246 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/signal.c 2007-12-15 05:19:59.803829063 +0100 +--- linux-2.4.35.4.orig/arch/mips64/kernel/signal.c ++++ linux-2.4.35.4/arch/mips64/kernel/signal.c @@ -6,8 +6,10 @@ * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 1994 - 2000 Ralf Baechle @@ -96,7 +96,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/signal.c #include <linux/sched.h> #include <linux/mm.h> #include <linux/smp.h> -@@ -75,7 +77,9 @@ +@@ -75,7 +77,9 @@ int copy_siginfo_to_user(siginfo_t *to, * Atomically swap in the new signal mask, and wait for a signal. */ save_static_function(sys_rt_sigsuspend); @@ -109,8 +109,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/signal.c 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 2007-12-15 05:19:39.174653475 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/signal32.c 2007-12-15 05:19:59.807829292 +0100 +--- linux-2.4.35.4.orig/arch/mips64/kernel/signal32.c ++++ linux-2.4.35.4/arch/mips64/kernel/signal32.c @@ -6,7 +6,9 @@ * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 1994 - 2000 Ralf Baechle @@ -121,7 +121,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/signal32.c #include <linux/sched.h> #include <linux/mm.h> #include <linux/smp.h> -@@ -192,7 +194,9 @@ +@@ -192,7 +194,9 @@ static inline int get_sigset(sigset_t *k * Atomically swap in the new signal mask, and wait for a signal. */ save_static_function(sys32_sigsuspend); @@ -132,7 +132,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/signal32.c { sigset32_t *uset; sigset_t newset, saveset; -@@ -219,7 +223,9 @@ +@@ -219,7 +223,9 @@ static_unused int _sys32_sigsuspend(abi6 } save_static_function(sys32_rt_sigsuspend); @@ -145,8 +145,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/signal32.c 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 2007-12-15 05:19:39.186654157 +0100 -+++ linux-2.4.35.4/arch/mips64/kernel/syscall.c 2007-12-15 05:19:59.811829522 +0100 +--- linux-2.4.35.4.orig/arch/mips64/kernel/syscall.c ++++ linux-2.4.35.4/arch/mips64/kernel/syscall.c @@ -6,7 +6,9 @@ * Copyright (C) 1995 - 2000, 2001 by Ralf Baechle * Copyright (C) 1999, 2000 Silicon Graphics, Inc. @@ -157,7 +157,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/syscall.c #include <linux/errno.h> #include <linux/linkage.h> #include <linux/mm.h> -@@ -151,7 +153,9 @@ +@@ -151,7 +153,9 @@ out: } save_static_function(sys_fork); @@ -168,7 +168,7 @@ Index: linux-2.4.35.4/arch/mips64/kernel/syscall.c { int res; -@@ -160,7 +164,9 @@ +@@ -160,7 +164,9 @@ static_unused int _sys_fork(abi64_no_reg } save_static_function(sys_clone); @@ -181,8 +181,8 @@ Index: linux-2.4.35.4/arch/mips64/kernel/syscall.c 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 2007-12-15 05:19:39.194654615 +0100 -+++ linux-2.4.35.4/include/asm-mips/ptrace.h 2007-12-15 05:19:59.815829748 +0100 +--- linux-2.4.35.4.orig/include/asm-mips/ptrace.h ++++ linux-2.4.35.4/include/asm-mips/ptrace.h @@ -4,6 +4,7 @@ * for more details. * @@ -191,7 +191,7 @@ Index: linux-2.4.35.4/include/asm-mips/ptrace.h * * Machine dependent structs and defines to help the user use * the ptrace system call. -@@ -64,12 +65,10 @@ +@@ -64,12 +65,10 @@ __asm__ ( "sw\t$22,"__str(PT_R22)"($29)\n\t" \ "sw\t$23,"__str(PT_R23)"($29)\n\t" \ "sw\t$30,"__str(PT_R30)"($29)\n\t" \ @@ -207,8 +207,8 @@ Index: linux-2.4.35.4/include/asm-mips/ptrace.h /* 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 2007-12-15 05:19:39.202655071 +0100 -+++ linux-2.4.35.4/include/asm-mips64/ptrace.h 2007-12-15 05:19:59.815829748 +0100 +--- linux-2.4.35.4.orig/include/asm-mips64/ptrace.h ++++ linux-2.4.35.4/include/asm-mips64/ptrace.h @@ -5,6 +5,7 @@ * * Copyright (C) 1994, 95, 96, 97, 98, 99, 2000 by Ralf Baechle @@ -217,7 +217,7 @@ Index: linux-2.4.35.4/include/asm-mips64/ptrace.h */ #ifndef _ASM_PTRACE_H #define _ASM_PTRACE_H -@@ -61,12 +62,10 @@ +@@ -61,12 +62,10 @@ __asm__ ( "sd\t$22,"__str(PT_R22)"($29)\n\t" \ "sd\t$23,"__str(PT_R23)"($29)\n\t" \ "sd\t$30,"__str(PT_R30)"($29)\n\t" \ diff --git a/target/linux/generic-2.4/patches/208-usb2_fix.patch b/target/linux/generic-2.4/patches/208-usb2_fix.patch index fe6b10dfd2..b210bdb1be 100644 --- a/target/linux/generic-2.4/patches/208-usb2_fix.patch +++ b/target/linux/generic-2.4/patches/208-usb2_fix.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/drivers/usb/host/ehci-q.c =================================================================== ---- linux-2.4.35.4.orig/drivers/usb/host/ehci-q.c 2007-12-15 05:19:39.114650056 +0100 -+++ linux-2.4.35.4/drivers/usb/host/ehci-q.c 2007-12-15 05:20:00.107846389 +0100 -@@ -782,6 +782,11 @@ +--- linux-2.4.35.4.orig/drivers/usb/host/ehci-q.c ++++ linux-2.4.35.4/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 */ (void) handshake (&ehci->regs->status, STS_ASS, 0, 150); diff --git a/target/linux/generic-2.4/patches/209-build_fixes.patch b/target/linux/generic-2.4/patches/209-build_fixes.patch index dbb5a88e64..30af60f83f 100644 --- a/target/linux/generic-2.4/patches/209-build_fixes.patch +++ b/target/linux/generic-2.4/patches/209-build_fixes.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/Makefile =================================================================== ---- linux-2.4.35.4.orig/Makefile 2007-12-15 05:19:51.427351715 +0100 -+++ linux-2.4.35.4/Makefile 2007-12-15 05:20:00.315858242 +0100 -@@ -362,7 +362,7 @@ +--- linux-2.4.35.4.orig/Makefile ++++ linux-2.4.35.4/Makefile +@@ -362,7 +362,7 @@ include/linux/compile.h: $(CONFIGURATION @rm -f .ver1 include/linux/version.h: ./Makefile @@ -11,7 +11,7 @@ Index: linux-2.4.35.4/Makefile (echo KERNELRELEASE \"$(KERNELRELEASE)\" exceeds $(uts_len) characters >&2; false) @echo \#define UTS_RELEASE \"$(KERNELRELEASE)\" > .ver @echo \#define LINUX_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)` >> .ver -@@ -500,7 +500,7 @@ +@@ -500,7 +500,7 @@ dep-files: scripts/mkdep archdep include ifdef CONFIG_MODVERSIONS $(MAKE) update-modverfile endif @@ -22,9 +22,9 @@ Index: linux-2.4.35.4/Makefile ifdef CONFIG_MODVERSIONS Index: linux-2.4.35.4/Rules.make =================================================================== ---- linux-2.4.35.4.orig/Rules.make 2007-12-15 05:19:39.078648003 +0100 -+++ linux-2.4.35.4/Rules.make 2007-12-15 05:20:00.315858242 +0100 -@@ -126,7 +126,7 @@ +--- linux-2.4.35.4.orig/Rules.make ++++ linux-2.4.35.4/Rules.make +@@ -126,7 +126,7 @@ endif # This make dependencies quickly # fastdep: dummy @@ -33,7 +33,7 @@ Index: linux-2.4.35.4/Rules.make ifdef ALL_SUB_DIRS $(MAKE) $(patsubst %,_sfdep_%,$(ALL_SUB_DIRS)) _FASTDEP_ALL_SUB_DIRS="$(ALL_SUB_DIRS)" endif -@@ -176,7 +176,14 @@ +@@ -176,7 +176,14 @@ modules: $(ALL_MOBJS) dummy \ _modinst__: dummy ifneq "$(strip $(ALL_MOBJS))" "" mkdir -p $(MODLIB)/kernel/$(MOD_DESTDIR) diff --git a/target/linux/generic-2.4/patches/210-fix-irq-serial.patch b/target/linux/generic-2.4/patches/210-fix-irq-serial.patch index 5fb1bfec6f..d98e65c322 100644 --- a/target/linux/generic-2.4/patches/210-fix-irq-serial.patch +++ b/target/linux/generic-2.4/patches/210-fix-irq-serial.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/drivers/char/serial.c =================================================================== ---- linux-2.4.35.4.orig/drivers/char/serial.c 2007-12-15 05:19:44.934981737 +0100 -+++ linux-2.4.35.4/drivers/char/serial.c 2007-12-15 05:20:00.539871010 +0100 -@@ -5458,18 +5458,6 @@ +--- linux-2.4.35.4.orig/drivers/char/serial.c ++++ linux-2.4.35.4/drivers/char/serial.c +@@ -5458,18 +5458,6 @@ static int __init rs_init(void) sizeof(struct rs_multiport_struct)); #endif } diff --git a/target/linux/generic-2.4/patches/212-htb_time_fix.patch b/target/linux/generic-2.4/patches/212-htb_time_fix.patch index 1bcdc01097..faef690a47 100644 --- a/target/linux/generic-2.4/patches/212-htb_time_fix.patch +++ b/target/linux/generic-2.4/patches/212-htb_time_fix.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/net/sched/sch_htb.c =================================================================== ---- linux-2.4.35.4.orig/net/sched/sch_htb.c 2007-12-15 05:19:39.010644128 +0100 -+++ linux-2.4.35.4/net/sched/sch_htb.c 2007-12-15 05:20:00.751883092 +0100 -@@ -369,7 +369,7 @@ +--- linux-2.4.35.4.orig/net/sched/sch_htb.c ++++ linux-2.4.35.4/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) { struct htb_class *cl = list_entry(l,struct htb_class,hlist); @@ -11,7 +11,7 @@ Index: linux-2.4.35.4/net/sched/sch_htb.c printk(KERN_DEBUG "htb*c%x m=%d t=%ld c=%ld pq=%lu df=%ld ql=%d " "pa=%x f:", cl->classid,cl->cmode,cl->tokens,cl->ctokens, -@@ -617,7 +617,7 @@ +@@ -617,7 +617,7 @@ static void htb_deactivate_prios(struct * mode transitions per time unit. The speed gain is about 1/6. */ static __inline__ enum htb_cmode @@ -20,7 +20,7 @@ Index: linux-2.4.35.4/net/sched/sch_htb.c { long toks; -@@ -650,7 +650,7 @@ +@@ -650,7 +650,7 @@ htb_class_mode(struct htb_class *cl,long * to mode other than HTB_CAN_SEND (see htb_add_to_wait_tree). */ static void @@ -29,7 +29,7 @@ Index: linux-2.4.35.4/net/sched/sch_htb.c { enum htb_cmode new_mode = htb_class_mode(cl,diff); -@@ -815,7 +815,8 @@ +@@ -815,7 +815,8 @@ static void htb_rate_timer(unsigned long static void htb_charge_class(struct htb_sched *q,struct htb_class *cl, int level,int bytes) { @@ -39,7 +39,7 @@ Index: linux-2.4.35.4/net/sched/sch_htb.c enum htb_cmode old_mode; HTB_DBG(5,1,"htb_chrg_cl cl=%X lev=%d len=%d\n",cl->classid,level,bytes); -@@ -831,7 +832,7 @@ +@@ -831,7 +832,7 @@ static void htb_charge_class(struct htb_ #ifdef HTB_DEBUG if (diff > cl->mbuffer || diff < 0 || PSCHED_TLESS(q->now, cl->t_c)) { if (net_ratelimit()) @@ -48,7 +48,7 @@ Index: linux-2.4.35.4/net/sched/sch_htb.c cl->classid, diff, (unsigned long long) q->now, (unsigned long long) cl->t_c, -@@ -848,7 +849,7 @@ +@@ -848,7 +849,7 @@ static void htb_charge_class(struct htb_ } HTB_ACCNT (ctokens,cbuffer,ceil); cl->t_c = q->now; @@ -57,7 +57,7 @@ Index: linux-2.4.35.4/net/sched/sch_htb.c old_mode = cl->cmode; diff = 0; htb_change_class_mode(q,cl,&diff); -@@ -887,7 +888,7 @@ +@@ -887,7 +888,7 @@ static long htb_do_events(struct htb_sch level,q->wait_pq[level].rb_node,q->row_mask[level]); for (i = 0; i < 500; i++) { struct htb_class *cl; @@ -66,7 +66,7 @@ Index: linux-2.4.35.4/net/sched/sch_htb.c rb_node_t *p = q->wait_pq[level].rb_node; if (!p) return 0; while (p->rb_left) p = p->rb_left; -@@ -902,7 +903,7 @@ +@@ -902,7 +903,7 @@ static long htb_do_events(struct htb_sch #ifdef HTB_DEBUG if (diff > cl->mbuffer || diff < 0 || PSCHED_TLESS(q->now, cl->t_c)) { if (net_ratelimit()) diff --git a/target/linux/generic-2.4/patches/213-htb_disable_hysteresis.patch b/target/linux/generic-2.4/patches/213-htb_disable_hysteresis.patch index c2b81901f5..6ea3074457 100644 --- a/target/linux/generic-2.4/patches/213-htb_disable_hysteresis.patch +++ b/target/linux/generic-2.4/patches/213-htb_disable_hysteresis.patch @@ -1,7 +1,7 @@ Index: linux-2.4.35.4/net/sched/sch_htb.c =================================================================== ---- linux-2.4.35.4.orig/net/sched/sch_htb.c 2007-12-15 05:20:00.751883092 +0100 -+++ linux-2.4.35.4/net/sched/sch_htb.c 2007-12-15 05:20:00.959894945 +0100 +--- linux-2.4.35.4.orig/net/sched/sch_htb.c ++++ linux-2.4.35.4/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) */ diff --git a/target/linux/generic-2.4/patches/222-sound.patch b/target/linux/generic-2.4/patches/222-sound.patch index 889964baef..48c03a3721 100644 --- a/target/linux/generic-2.4/patches/222-sound.patch +++ b/target/linux/generic-2.4/patches/222-sound.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/drivers/sound/sound_core.c =================================================================== ---- linux-2.4.35.4.orig/drivers/sound/sound_core.c 2007-12-15 05:19:38.946640480 +0100 -+++ linux-2.4.35.4/drivers/sound/sound_core.c 2007-12-15 05:20:01.199908622 +0100 -@@ -174,9 +174,9 @@ +--- linux-2.4.35.4.orig/drivers/sound/sound_core.c ++++ linux-2.4.35.4/drivers/sound/sound_core.c +@@ -174,9 +174,9 @@ static int sound_insert_unit(struct soun } if (r == low) @@ -14,7 +14,7 @@ Index: linux-2.4.35.4/drivers/sound/sound_core.c s->de = devfs_register (devfs_handle, name_buf, DEVFS_FL_NONE, SOUND_MAJOR, s->unit_minor, S_IFCHR | mode, fops, NULL); -@@ -507,9 +507,9 @@ +@@ -507,9 +507,9 @@ int soundcore_open(struct inode *inode, * ALSA toplevel modules for soundcards, thus we need * load them at first. [Jaroslav Kysela <perex@jcu.cz>] */ diff --git a/target/linux/generic-2.4/patches/224-atm_hotplug.patch b/target/linux/generic-2.4/patches/224-atm_hotplug.patch index 97cb42c49f..64dd3e8a3b 100644 --- a/target/linux/generic-2.4/patches/224-atm_hotplug.patch +++ b/target/linux/generic-2.4/patches/224-atm_hotplug.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/include/linux/atmdev.h =================================================================== ---- linux-2.4.35.4.orig/include/linux/atmdev.h 2007-12-15 05:19:38.898637744 +0100 -+++ linux-2.4.35.4/include/linux/atmdev.h 2007-12-15 05:20:02.816000717 +0100 -@@ -400,6 +400,7 @@ +--- linux-2.4.35.4.orig/include/linux/atmdev.h ++++ linux-2.4.35.4/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 */ struct atm_dev *atm_dev_lookup(int number); @@ -12,8 +12,8 @@ Index: linux-2.4.35.4/include/linux/atmdev.h 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 2007-12-15 05:19:38.910638429 +0100 -+++ linux-2.4.35.4/net/atm/resources.c 2007-12-15 05:20:02.824001175 +0100 +--- linux-2.4.35.4.orig/net/atm/resources.c ++++ linux-2.4.35.4/net/atm/resources.c @@ -10,6 +10,7 @@ #include <linux/sonet.h> #include <linux/kernel.h> /* for barrier */ @@ -22,7 +22,7 @@ Index: linux-2.4.35.4/net/atm/resources.c #include <linux/bitops.h> #include <net/sock.h> /* for struct sock */ #include <asm/segment.h> /* for get_fs_long and put_fs_long */ -@@ -70,6 +71,44 @@ +@@ -70,6 +71,44 @@ struct atm_dev *atm_dev_lookup(int numbe return dev; } @@ -67,7 +67,7 @@ Index: linux-2.4.35.4/net/atm/resources.c struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops, int number, atm_dev_flags_t *flags) { -@@ -123,7 +162,10 @@ +@@ -123,7 +162,10 @@ struct atm_dev *atm_dev_register(const c } } #endif @@ -79,7 +79,7 @@ Index: linux-2.4.35.4/net/atm/resources.c return dev; } -@@ -131,6 +173,10 @@ +@@ -131,6 +173,10 @@ struct atm_dev *atm_dev_register(const c void atm_dev_deregister(struct atm_dev *dev) { unsigned long warning_time; @@ -90,7 +90,7 @@ Index: linux-2.4.35.4/net/atm/resources.c #ifdef CONFIG_PROC_FS if (dev->ops->proc_read) -@@ -399,6 +445,7 @@ +@@ -399,6 +445,7 @@ done: } diff --git a/target/linux/generic-2.4/patches/225-string_lib_useful_exports.patch b/target/linux/generic-2.4/patches/225-string_lib_useful_exports.patch index 0a4bd10065..0d6d1fadb1 100644 --- a/target/linux/generic-2.4/patches/225-string_lib_useful_exports.patch +++ b/target/linux/generic-2.4/patches/225-string_lib_useful_exports.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/lib/string.c =================================================================== ---- linux-2.4.35.4.orig/lib/string.c 2007-12-15 05:19:38.866635920 +0100 -+++ linux-2.4.35.4/lib/string.c 2007-12-15 05:20:03.080015763 +0100 -@@ -50,6 +50,7 @@ +--- linux-2.4.35.4.orig/lib/string.c ++++ linux-2.4.35.4/lib/string.c +@@ -50,6 +50,7 @@ int strnicmp(const char *s1, const char } return (int)c1 - (int)c2; } @@ -10,7 +10,7 @@ Index: linux-2.4.35.4/lib/string.c #endif char * ___strtok; -@@ -68,6 +69,7 @@ +@@ -68,6 +69,7 @@ char * strcpy(char * dest,const char *sr /* nothing */; return tmp; } @@ -18,7 +18,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_STRNCPY -@@ -90,6 +92,7 @@ +@@ -90,6 +92,7 @@ char * strncpy(char * dest,const char *s return tmp; } @@ -26,7 +26,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_STRCAT -@@ -109,6 +112,7 @@ +@@ -109,6 +112,7 @@ char * strcat(char * dest, const char * return tmp; } @@ -34,7 +34,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_STRNCAT -@@ -138,6 +142,7 @@ +@@ -138,6 +142,7 @@ char * strncat(char *dest, const char *s return tmp; } @@ -42,7 +42,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_STRCMP -@@ -157,6 +162,7 @@ +@@ -157,6 +162,7 @@ int strcmp(const char * cs,const char * return __res; } @@ -50,7 +50,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_STRNCMP -@@ -178,6 +184,7 @@ +@@ -178,6 +184,7 @@ int strncmp(const char * cs,const char * return __res; } @@ -58,7 +58,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_STRCHR -@@ -193,6 +200,7 @@ +@@ -193,6 +200,7 @@ char * strchr(const char * s, int c) return NULL; return (char *) s; } @@ -66,7 +66,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_STRRCHR -@@ -210,6 +218,7 @@ +@@ -210,6 +218,7 @@ char * strrchr(const char * s, int c) } while (--p >= s); return NULL; } @@ -74,7 +74,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_STRLEN -@@ -225,6 +234,7 @@ +@@ -225,6 +234,7 @@ size_t strlen(const char * s) /* nothing */; return sc - s; } @@ -82,7 +82,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_STRNLEN -@@ -241,6 +251,7 @@ +@@ -241,6 +251,7 @@ size_t strnlen(const char * s, size_t co /* nothing */; return sc - s; } @@ -90,7 +90,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_STRSPN -@@ -268,6 +279,7 @@ +@@ -268,6 +279,7 @@ size_t strspn(const char *s, const char return count; } @@ -98,7 +98,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_STRPBRK -@@ -288,6 +300,7 @@ +@@ -288,6 +300,7 @@ char * strpbrk(const char * cs,const cha } return NULL; } @@ -106,7 +106,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_STRTOK -@@ -345,6 +358,7 @@ +@@ -345,6 +358,7 @@ char * strsep(char **s, const char *ct) return sbegin; } @@ -114,7 +114,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_MEMSET -@@ -365,6 +379,7 @@ +@@ -365,6 +379,7 @@ void * memset(void * s,int c,size_t coun return s; } @@ -122,7 +122,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_BCOPY -@@ -409,6 +424,7 @@ +@@ -409,6 +424,7 @@ void * memcpy(void * dest,const void *sr return dest; } @@ -130,7 +130,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_MEMMOVE -@@ -439,6 +455,7 @@ +@@ -439,6 +455,7 @@ void * memmove(void * dest,const void *s return dest; } @@ -138,7 +138,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_MEMCMP -@@ -458,6 +475,7 @@ +@@ -458,6 +475,7 @@ int memcmp(const void * cs,const void * break; return res; } @@ -146,7 +146,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_MEMSCAN -@@ -482,6 +500,7 @@ +@@ -482,6 +500,7 @@ void * memscan(void * addr, int c, size_ } return (void *) p; } @@ -154,7 +154,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_STRSTR -@@ -506,6 +525,7 @@ +@@ -506,6 +525,7 @@ char * strstr(const char * s1,const char } return NULL; } @@ -162,7 +162,7 @@ Index: linux-2.4.35.4/lib/string.c #endif #ifndef __HAVE_ARCH_MEMCHR -@@ -528,5 +548,5 @@ +@@ -528,5 +548,5 @@ void *memchr(const void *s, int c, size_ } return NULL; } diff --git a/target/linux/generic-2.4/patches/226-atm_br2684.patch b/target/linux/generic-2.4/patches/226-atm_br2684.patch index 59289a1b30..9ec555ed33 100644 --- a/target/linux/generic-2.4/patches/226-atm_br2684.patch +++ b/target/linux/generic-2.4/patches/226-atm_br2684.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/net/atm/br2684.c =================================================================== ---- linux-2.4.35.4.orig/net/atm/br2684.c 2007-12-15 05:19:38.818633185 +0100 -+++ linux-2.4.35.4/net/atm/br2684.c 2007-12-15 05:20:03.656048591 +0100 -@@ -55,36 +55,55 @@ +--- linux-2.4.35.4.orig/net/atm/br2684.c ++++ linux-2.4.35.4/net/atm/br2684.c +@@ -55,36 +55,55 @@ static void skb_debug(const struct sk_bu #define skb_debug(skb) do {} while (0) #endif @@ -64,7 +64,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c struct net_device_stats stats; int mac_was_set; }; -@@ -173,24 +192,84 @@ +@@ -173,24 +192,84 @@ static int br2684_xmit_vcc(struct sk_buf } skb = skb2; } @@ -160,7 +160,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c atomic_add(skb->truesize, &atmvcc->sk->wmem_alloc); ATM_SKB(skb)->atm_options = atmvcc->atm_options; brdev->stats.tx_packets++; -@@ -428,18 +507,39 @@ +@@ -428,18 +507,39 @@ static void br2684_push(struct atm_vcc * atm_return(atmvcc, skb->truesize); DPRINTK("skb from brdev %p\n", brdev); if (brvcc->encaps == e_llc) { @@ -205,7 +205,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c } else { plen = PADLEN + ETH_HLEN; /* pad, dstmac,srcmac, ethtype */ /* first 2 chars should be 0 */ -@@ -448,13 +548,14 @@ +@@ -448,13 +548,14 @@ static void br2684_push(struct atm_vcc * dev_kfree_skb(skb); return; } @@ -221,7 +221,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c #ifdef FASTER_VERSION /* FIXME: tcpdump shows that pointer to mac header is 2 bytes earlier, than should be. What else should I set? */ -@@ -465,30 +566,29 @@ +@@ -465,30 +566,29 @@ static void br2684_push(struct atm_vcc * skb->protocol = ((u16 *) skb->data)[-1]; #else /* some protocols might require this: */ skb->protocol = br_type_trans(skb, &brdev->net_dev); @@ -259,7 +259,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c netif_rx(skb); } -@@ -525,10 +625,10 @@ +@@ -525,10 +625,10 @@ Note: we do not have explicit unassign, err = -EEXIST; goto error; } @@ -274,7 +274,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c err = -EINVAL; goto error; } -@@ -554,18 +654,21 @@ +@@ -554,18 +654,21 @@ Note: we do not have explicit unassign, brvcc->atmvcc = atmvcc; atmvcc->user_back = brvcc; brvcc->encaps = (enum br2684_encaps) be.encaps; @@ -297,7 +297,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c write_unlock_irq(&devs_lock); MOD_DEC_USE_COUNT; return err; -@@ -608,12 +711,25 @@ +@@ -608,12 +711,25 @@ static int br2684_create(unsigned long a if (ni.ifname[0] != '\0') { memcpy(brdev->net_dev.name, ni.ifname, @@ -326,7 +326,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c brdev->mac_was_set = 0; #ifdef FASTER_VERSION my_eth_header = brdev->net_dev.hard_header; -@@ -677,12 +793,11 @@ +@@ -677,12 +793,11 @@ static int br2684_ioctl(struct atm_vcc * err = br2684_setfilt(atmvcc, arg); MOD_DEC_USE_COUNT; return err; @@ -340,7 +340,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c /* Never put more than 256 bytes in at once */ static int br2684_proc_engine(loff_t pos, char *buf) { -@@ -692,52 +807,62 @@ +@@ -692,52 +807,62 @@ static int br2684_proc_engine(loff_t pos list_for_each(lhd, &br2684_devs) { brdev = list_entry_brdev(lhd); if (pos-- == 0) @@ -428,7 +428,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c page = get_free_page(GFP_KERNEL); if (!page) return -ENOMEM; -@@ -746,7 +871,7 @@ +@@ -746,7 +871,7 @@ static ssize_t br2684_proc_read(struct f left = count; read_lock(&devs_lock); for (;;) { @@ -437,7 +437,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c if (x == 0) break; if (x > left) -@@ -761,12 +886,11 @@ +@@ -761,12 +886,11 @@ static ssize_t br2684_proc_read(struct f } len += x; left -= x; @@ -451,7 +451,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c if (len > 0 && copy_to_user(buf, (char *) page, len)) len = -EFAULT; free_page(page); -@@ -774,23 +898,20 @@ +@@ -774,23 +898,20 @@ static ssize_t br2684_proc_read(struct f } static struct file_operations br2684_proc_operations = { @@ -476,7 +476,7 @@ Index: linux-2.4.35.4/net/atm/br2684.c br2684_ioctl_set(br2684_ioctl); return 0; } -@@ -799,9 +920,7 @@ +@@ -799,9 +920,7 @@ static void __exit UNUSED br2684_exit(vo { struct br2684_dev *brdev; br2684_ioctl_set(NULL); @@ -488,9 +488,9 @@ Index: linux-2.4.35.4/net/atm/br2684.c 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 2007-12-15 05:19:38.826633641 +0100 -+++ linux-2.4.35.4/net/atm/common.c 2007-12-15 05:20:03.656048591 +0100 -@@ -158,6 +158,7 @@ +--- linux-2.4.35.4.orig/net/atm/common.c ++++ linux-2.4.35.4/net/atm/common.c +@@ -158,6 +158,7 @@ void br2684_ioctl_set(int (*hook)(struct } #ifdef CONFIG_ATM_BR2684_MODULE EXPORT_SYMBOL(br2684_ioctl_set); @@ -500,8 +500,8 @@ Index: linux-2.4.35.4/net/atm/common.c Index: linux-2.4.35.4/include/linux/atmbr2684.h =================================================================== ---- linux-2.4.35.4.orig/include/linux/atmbr2684.h 2007-12-15 05:19:38.838634325 +0100 -+++ linux-2.4.35.4/include/linux/atmbr2684.h 2007-12-15 05:20:03.668049273 +0100 +--- linux-2.4.35.4.orig/include/linux/atmbr2684.h ++++ linux-2.4.35.4/include/linux/atmbr2684.h @@ -3,6 +3,7 @@ #include <linux/atm.h> @@ -539,7 +539,7 @@ Index: linux-2.4.35.4/include/linux/atmbr2684.h }; /* -@@ -68,16 +78,17 @@ +@@ -68,16 +78,17 @@ struct br2684_if_spec { * is per-backend specific */ struct atm_backend_br2684 { @@ -566,7 +566,7 @@ Index: linux-2.4.35.4/include/linux/atmbr2684.h }; /* -@@ -95,7 +106,12 @@ +@@ -95,7 +106,12 @@ struct br2684_filter_set { struct br2684_filter filter; }; diff --git a/target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch b/target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch index 119f1d4d87..29a0e5e856 100644 --- a/target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch +++ b/target/linux/generic-2.4/patches/227-jffs2_eofdetect.patch @@ -1,7 +1,7 @@ Index: linux-2.4.35.4/fs/jffs2/build.c =================================================================== ---- linux-2.4.35.4.orig/fs/jffs2/build.c 2007-12-15 05:19:38.778630906 +0100 -+++ linux-2.4.35.4/fs/jffs2/build.c 2007-12-15 05:20:03.936064549 +0100 +--- linux-2.4.35.4.orig/fs/jffs2/build.c ++++ linux-2.4.35.4/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. @@ -21,7 +21,7 @@ Index: linux-2.4.35.4/fs/jffs2/build.c #include "nodelist.h" int jffs2_build_inode_pass1(struct jffs2_sb_info *, struct jffs2_inode_cache *); -@@ -89,6 +94,18 @@ +@@ -89,6 +94,18 @@ int jffs2_build_filesystem(struct jffs2_ if (ret) return ret; @@ -42,8 +42,8 @@ Index: linux-2.4.35.4/fs/jffs2/build.c 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 2007-12-15 05:19:38.786631361 +0100 -+++ linux-2.4.35.4/fs/jffs2/scan.c 2007-12-15 05:20:03.948065230 +0100 +--- linux-2.4.35.4.orig/fs/jffs2/scan.c ++++ linux-2.4.35.4/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. @@ -55,7 +55,7 @@ Index: linux-2.4.35.4/fs/jffs2/scan.c * $Id: scan.c,v 1.51.2.4 2003/11/02 13:51:18 dwmw2 Exp $ * */ -@@ -88,7 +92,12 @@ +@@ -88,7 +92,12 @@ int jffs2_scan_medium(struct jffs2_sb_in for (i=0; i<c->nr_blocks; i++) { struct jffs2_eraseblock *jeb = &c->blocks[i]; @@ -69,7 +69,7 @@ Index: linux-2.4.35.4/fs/jffs2/scan.c if (ret < 0) return ret; -@@ -181,6 +190,7 @@ +@@ -181,6 +190,7 @@ static int jffs2_scan_eraseblock (struct while(ofs < jeb->offset + c->sector_size) { ssize_t retlen; @@ -77,7 +77,7 @@ Index: linux-2.4.35.4/fs/jffs2/scan.c ACCT_PARANOIA_CHECK(jeb); if (ofs & 3) { -@@ -202,8 +212,18 @@ +@@ -202,8 +212,18 @@ static int jffs2_scan_eraseblock (struct break; } diff --git a/target/linux/generic-2.4/patches/228-more_usb_fixes.patch b/target/linux/generic-2.4/patches/228-more_usb_fixes.patch index 6dc3931ca0..7c475ffb58 100644 --- a/target/linux/generic-2.4/patches/228-more_usb_fixes.patch +++ b/target/linux/generic-2.4/patches/228-more_usb_fixes.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/drivers/scsi/hosts.c =================================================================== ---- linux-2.4.35.4.orig/drivers/scsi/hosts.c 2007-12-15 05:19:38.686625662 +0100 -+++ linux-2.4.35.4/drivers/scsi/hosts.c 2007-12-15 05:20:04.720109227 +0100 -@@ -107,8 +107,21 @@ +--- linux-2.4.35.4.orig/drivers/scsi/hosts.c ++++ linux-2.4.35.4/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... */ @@ -27,9 +27,9 @@ Index: linux-2.4.35.4/drivers/scsi/hosts.c Index: linux-2.4.35.4/drivers/usb/hcd.c =================================================================== ---- linux-2.4.35.4.orig/drivers/usb/hcd.c 2007-12-15 05:19:38.694626120 +0100 -+++ linux-2.4.35.4/drivers/usb/hcd.c 2007-12-15 05:20:04.724109453 +0100 -@@ -1105,7 +1105,8 @@ +--- linux-2.4.35.4.orig/drivers/usb/hcd.c ++++ linux-2.4.35.4/drivers/usb/hcd.c +@@ -1105,7 +1105,8 @@ static int hcd_submit_urb (struct urb *u break; case PIPE_BULK: allowed |= USB_DISABLE_SPD | USB_QUEUE_BULK @@ -39,7 +39,7 @@ Index: linux-2.4.35.4/drivers/usb/hcd.c break; case PIPE_INTERRUPT: allowed |= USB_DISABLE_SPD; -@@ -1212,7 +1213,8 @@ +@@ -1212,7 +1213,8 @@ static int hcd_submit_urb (struct urb *u urb->setup_packet, sizeof (struct usb_ctrlrequest), PCI_DMA_TODEVICE); @@ -51,9 +51,9 @@ Index: linux-2.4.35.4/drivers/usb/hcd.c 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 2007-12-15 05:19:38.702626576 +0100 -+++ linux-2.4.35.4/drivers/usb/host/ehci-hcd.c 2007-12-15 05:20:04.728109682 +0100 -@@ -399,6 +399,27 @@ +--- linux-2.4.35.4.orig/drivers/usb/host/ehci-hcd.c ++++ linux-2.4.35.4/drivers/usb/host/ehci-hcd.c +@@ -399,6 +399,27 @@ static int ehci_start (struct usb_hcd *h ehci_mem_cleanup (ehci); return retval; } @@ -83,9 +83,9 @@ Index: linux-2.4.35.4/drivers/usb/host/ehci-hcd.c Index: linux-2.4.35.4/drivers/usb/host/ehci-q.c =================================================================== ---- linux-2.4.35.4.orig/drivers/usb/host/ehci-q.c 2007-12-15 05:20:00.107846389 +0100 -+++ linux-2.4.35.4/drivers/usb/host/ehci-q.c 2007-12-15 05:20:04.728109682 +0100 -@@ -791,6 +791,8 @@ +--- linux-2.4.35.4.orig/drivers/usb/host/ehci-q.c ++++ linux-2.4.35.4/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; /* posted write need not be known to HC yet ... */ @@ -96,9 +96,9 @@ Index: linux-2.4.35.4/drivers/usb/host/ehci-q.c Index: linux-2.4.35.4/drivers/usb/host/usb-uhci.c =================================================================== ---- linux-2.4.35.4.orig/drivers/usb/host/usb-uhci.c 2007-12-15 05:19:38.714627260 +0100 -+++ linux-2.4.35.4/drivers/usb/host/usb-uhci.c 2007-12-15 05:20:04.728109682 +0100 -@@ -3034,6 +3034,21 @@ +--- linux-2.4.35.4.orig/drivers/usb/host/usb-uhci.c ++++ linux-2.4.35.4/drivers/usb/host/usb-uhci.c +@@ -3034,6 +3034,21 @@ uhci_pci_probe (struct pci_dev *dev, con pci_set_master(dev); @@ -122,8 +122,8 @@ Index: linux-2.4.35.4/drivers/usb/host/usb-uhci.c Index: linux-2.4.35.4/drivers/usb/storage/transport.c =================================================================== ---- linux-2.4.35.4.orig/drivers/usb/storage/transport.c 2007-12-15 05:19:38.722627715 +0100 -+++ linux-2.4.35.4/drivers/usb/storage/transport.c 2007-12-15 05:20:04.732109911 +0100 +--- linux-2.4.35.4.orig/drivers/usb/storage/transport.c ++++ linux-2.4.35.4/drivers/usb/storage/transport.c @@ -54,6 +54,22 @@ #include <linux/sched.h> #include <linux/errno.h> @@ -147,7 +147,7 @@ Index: linux-2.4.35.4/drivers/usb/storage/transport.c /*********************************************************************** * Helper routines -@@ -554,6 +570,543 @@ +@@ -554,6 +570,543 @@ int usb_stor_transfer_partial(struct us_ return US_BULK_TRANSFER_SHORT; } @@ -691,7 +691,7 @@ Index: linux-2.4.35.4/drivers/usb/storage/transport.c /* * Transfer an entire SCSI command's worth of data payload over the bulk * pipe. -@@ -569,6 +1122,8 @@ +@@ -569,6 +1122,8 @@ void usb_stor_transfer(Scsi_Cmnd *srb, s struct scatterlist *sg; unsigned int total_transferred = 0; unsigned int transfer_amount; @@ -700,7 +700,7 @@ Index: linux-2.4.35.4/drivers/usb/storage/transport.c /* calculate how much we want to transfer */ transfer_amount = usb_stor_transfer_length(srb); -@@ -585,23 +1140,34 @@ +@@ -585,23 +1140,34 @@ void usb_stor_transfer(Scsi_Cmnd *srb, s * make the appropriate requests for each, until done */ sg = (struct scatterlist *) srb->request_buffer; @@ -754,9 +754,9 @@ Index: linux-2.4.35.4/drivers/usb/storage/transport.c else Index: linux-2.4.35.4/drivers/usb/storage/transport.h =================================================================== ---- linux-2.4.35.4.orig/drivers/usb/storage/transport.h 2007-12-15 05:19:38.730628171 +0100 -+++ linux-2.4.35.4/drivers/usb/storage/transport.h 2007-12-15 05:20:04.732109911 +0100 -@@ -127,6 +127,16 @@ +--- linux-2.4.35.4.orig/drivers/usb/storage/transport.h ++++ linux-2.4.35.4/drivers/usb/storage/transport.h +@@ -127,6 +127,16 @@ struct bulk_cs_wrap { #define US_BULK_TRANSFER_ABORTED 3 /* transfer canceled */ /* @@ -775,9 +775,9 @@ Index: linux-2.4.35.4/drivers/usb/storage/transport.h Index: linux-2.4.35.4/drivers/usb/storage/usb.h =================================================================== ---- linux-2.4.35.4.orig/drivers/usb/storage/usb.h 2007-12-15 05:19:38.738628626 +0100 -+++ linux-2.4.35.4/drivers/usb/storage/usb.h 2007-12-15 05:20:04.736110140 +0100 -@@ -111,6 +111,60 @@ +--- linux-2.4.35.4.orig/drivers/usb/storage/usb.h ++++ linux-2.4.35.4/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 */ @@ -838,7 +838,7 @@ Index: linux-2.4.35.4/drivers/usb/storage/usb.h /* we allocate one of these for every device that we remember */ struct us_data { struct us_data *next; /* next device */ -@@ -171,6 +225,7 @@ +@@ -171,6 +225,7 @@ struct us_data { struct urb *current_urb; /* non-int USB requests */ struct completion current_done; /* the done flag */ unsigned int tag; /* tag for bulk CBW/CSW */ @@ -848,9 +848,9 @@ Index: linux-2.4.35.4/drivers/usb/storage/usb.h 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 2007-12-15 05:19:38.750629310 +0100 -+++ linux-2.4.35.4/include/linux/usb.h 2007-12-15 05:20:04.740110367 +0100 -@@ -483,6 +483,8 @@ +--- linux-2.4.35.4.orig/include/linux/usb.h ++++ linux-2.4.35.4/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 */ #define USB_TIMEOUT_KILLED 0x1000 // only set by HCD! diff --git a/target/linux/generic-2.4/patches/230-tun_get_user_backport.patch b/target/linux/generic-2.4/patches/230-tun_get_user_backport.patch index a671d1a271..acddc0182e 100644 --- a/target/linux/generic-2.4/patches/230-tun_get_user_backport.patch +++ b/target/linux/generic-2.4/patches/230-tun_get_user_backport.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/include/linux/skbuff.h =================================================================== ---- linux-2.4.35.4.orig/include/linux/skbuff.h 2007-12-15 05:19:38.654623841 +0100 -+++ linux-2.4.35.4/include/linux/skbuff.h 2007-12-15 05:20:05.060128604 +0100 -@@ -912,6 +912,49 @@ +--- linux-2.4.35.4.orig/include/linux/skbuff.h ++++ linux-2.4.35.4/include/linux/skbuff.h +@@ -912,6 +912,49 @@ static inline void skb_reserve(struct sk skb->tail+=len; } @@ -54,9 +54,9 @@ Index: linux-2.4.35.4/include/linux/skbuff.h 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 2007-12-15 05:19:38.642623156 +0100 -+++ linux-2.4.35.4/drivers/net/tun.c 2007-12-15 05:20:05.056128377 +0100 -@@ -185,22 +185,31 @@ +--- linux-2.4.35.4.orig/drivers/net/tun.c ++++ linux-2.4.35.4/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) }; struct sk_buff *skb; @@ -94,7 +94,7 @@ Index: linux-2.4.35.4/drivers/net/tun.c skb->dev = &tun->dev; switch (tun->flags & TUN_TYPE_MASK) { -@@ -271,7 +280,8 @@ +@@ -271,7 +280,8 @@ static __inline__ ssize_t tun_put_user(s pi.flags |= TUN_PKT_STRIP; } diff --git a/target/linux/generic-2.4/patches/231-mini_fo.patch b/target/linux/generic-2.4/patches/231-mini_fo.patch index 018762a971..864cb70add 100644 --- a/target/linux/generic-2.4/patches/231-mini_fo.patch +++ b/target/linux/generic-2.4/patches/231-mini_fo.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/fs/Config.in =================================================================== ---- linux-2.4.35.4.orig/fs/Config.in 2007-12-15 05:19:52.319402550 +0100 -+++ linux-2.4.35.4/fs/Config.in 2007-12-15 05:20:05.284141367 +0100 -@@ -77,6 +77,7 @@ +--- linux-2.4.35.4.orig/fs/Config.in ++++ linux-2.4.35.4/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 'Minix fs support' CONFIG_MINIX_FS @@ -12,9 +12,9 @@ Index: linux-2.4.35.4/fs/Config.in 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 2007-12-15 05:19:52.319402550 +0100 -+++ linux-2.4.35.4/fs/Makefile 2007-12-15 05:20:05.288141596 +0100 -@@ -31,6 +31,7 @@ +--- linux-2.4.35.4.orig/fs/Makefile ++++ linux-2.4.35.4/fs/Makefile +@@ -31,6 +31,7 @@ subdir-$(CONFIG_RAMFS) += ramfs subdir-$(CONFIG_CODA_FS) += coda subdir-$(CONFIG_INTERMEZZO_FS) += intermezzo subdir-$(CONFIG_MINIX_FS) += minix @@ -24,8 +24,8 @@ Index: linux-2.4.35.4/fs/Makefile subdir-$(CONFIG_MSDOS_FS) += msdos Index: linux-2.4.35.4/fs/mini_fo/aux.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/mini_fo/aux.c 2007-12-15 05:20:05.296142055 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/mini_fo/aux.c @@ -0,0 +1,580 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -609,8 +609,8 @@ Index: linux-2.4.35.4/fs/mini_fo/aux.c + Index: linux-2.4.35.4/fs/mini_fo/ChangeLog =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/mini_fo/ChangeLog 2007-12-15 05:20:05.296142055 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/mini_fo/ChangeLog @@ -0,0 +1,281 @@ +2006-01-24 Markus Klotzbuecher <mk@mary.denx.de> + @@ -895,8 +895,8 @@ Index: linux-2.4.35.4/fs/mini_fo/ChangeLog + Index: linux-2.4.35.4/fs/mini_fo/dentry.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/mini_fo/dentry.c 2007-12-15 05:20:05.296142055 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/mini_fo/dentry.c @@ -0,0 +1,244 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -1144,8 +1144,8 @@ Index: linux-2.4.35.4/fs/mini_fo/dentry.c +}; Index: linux-2.4.35.4/fs/mini_fo/file.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/mini_fo/file.c 2007-12-15 05:20:05.300142281 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/mini_fo/file.c @@ -0,0 +1,717 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -1866,8 +1866,8 @@ Index: linux-2.4.35.4/fs/mini_fo/file.c + }; Index: linux-2.4.35.4/fs/mini_fo/fist.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/mini_fo/fist.h 2007-12-15 05:20:05.300142281 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/mini_fo/fist.h @@ -0,0 +1,248 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -2119,8 +2119,8 @@ Index: linux-2.4.35.4/fs/mini_fo/fist.h +#endif /* not __FIST_H_ */ Index: linux-2.4.35.4/fs/mini_fo/inode.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/mini_fo/inode.c 2007-12-15 05:20:05.300142281 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/mini_fo/inode.c @@ -0,0 +1,1573 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -3697,8 +3697,8 @@ Index: linux-2.4.35.4/fs/mini_fo/inode.c + }; Index: linux-2.4.35.4/fs/mini_fo/main.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/mini_fo/main.c 2007-12-15 05:20:05.300142281 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/mini_fo/main.c @@ -0,0 +1,414 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -4116,8 +4116,8 @@ Index: linux-2.4.35.4/fs/mini_fo/main.c +module_exit(exit_mini_fo_fs) Index: linux-2.4.35.4/fs/mini_fo/Makefile =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/mini_fo/Makefile 2007-12-15 05:20:05.304142507 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/mini_fo/Makefile @@ -0,0 +1,22 @@ +# +# Makefile for mini_fo 2.4 and 2.6 Linux kernels @@ -4143,8 +4143,8 @@ Index: linux-2.4.35.4/fs/mini_fo/Makefile + Index: linux-2.4.35.4/fs/mini_fo/meta.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/mini_fo/meta.c 2007-12-15 05:20:05.304142507 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/mini_fo/meta.c @@ -0,0 +1,1000 @@ +/* + * Copyright (C) 2004, 2005 Markus Klotzbuecher <mk@creamnet.de> @@ -5148,8 +5148,8 @@ Index: linux-2.4.35.4/fs/mini_fo/meta.c + Index: linux-2.4.35.4/fs/mini_fo/mini_fo.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/mini_fo/mini_fo.h 2007-12-15 05:20:05.304142507 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/mini_fo/mini_fo.h @@ -0,0 +1,503 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -5656,8 +5656,8 @@ Index: linux-2.4.35.4/fs/mini_fo/mini_fo.h +#endif /* not __MINI_FO_H_ */ Index: linux-2.4.35.4/fs/mini_fo/mini_fo-merge =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/mini_fo/mini_fo-merge 2007-12-15 05:20:05.304142507 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/mini_fo/mini_fo-merge @@ -0,0 +1,180 @@ +#!/bin/bash +# @@ -5841,8 +5841,8 @@ Index: linux-2.4.35.4/fs/mini_fo/mini_fo-merge +echo "Done!" Index: linux-2.4.35.4/fs/mini_fo/mini_fo-overlay =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/mini_fo/mini_fo-overlay 2007-12-15 05:20:05.308142736 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/mini_fo/mini_fo-overlay @@ -0,0 +1,130 @@ +#!/bin/bash +# @@ -5976,8 +5976,8 @@ Index: linux-2.4.35.4/fs/mini_fo/mini_fo-overlay +fi Index: linux-2.4.35.4/fs/mini_fo/mmap.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/mini_fo/mmap.c 2007-12-15 05:20:05.316143195 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/mini_fo/mmap.c @@ -0,0 +1,637 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok @@ -6618,8 +6618,8 @@ Index: linux-2.4.35.4/fs/mini_fo/mmap.c +} Index: linux-2.4.35.4/fs/mini_fo/README =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/mini_fo/README 2007-12-15 05:20:05.316143195 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/mini_fo/README @@ -0,0 +1,163 @@ +README for the mini_fo overlay file system +========================================= @@ -6786,8 +6786,8 @@ Index: linux-2.4.35.4/fs/mini_fo/README + Index: linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES 2007-12-15 05:20:05.316143195 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES @@ -0,0 +1,111 @@ +Release: mini_fo-0.6.1 (v0-6-1) +Date: 21.09.2005 @@ -6902,8 +6902,8 @@ Index: linux-2.4.35.4/fs/mini_fo/RELEASE_NOTES +seperately by the lower fs. Index: linux-2.4.35.4/fs/mini_fo/state.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/mini_fo/state.c 2007-12-15 05:20:05.316143195 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/mini_fo/state.c @@ -0,0 +1,620 @@ +/* + * Copyright (C) 2005 Markus Klotzbuecher <mk@creamnet.de> @@ -7527,8 +7527,8 @@ Index: linux-2.4.35.4/fs/mini_fo/state.c + Index: linux-2.4.35.4/fs/mini_fo/super.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/fs/mini_fo/super.c 2007-12-15 05:20:05.316143195 +0100 +--- /dev/null ++++ linux-2.4.35.4/fs/mini_fo/super.c @@ -0,0 +1,259 @@ +/* + * Copyright (c) 1997-2003 Erez Zadok diff --git a/target/linux/generic-2.4/patches/601-netfilter_ipp2p_0.8.1rc1.patch b/target/linux/generic-2.4/patches/601-netfilter_ipp2p_0.8.1rc1.patch index c2b5199630..1c9ce76477 100644 --- a/target/linux/generic-2.4/patches/601-netfilter_ipp2p_0.8.1rc1.patch +++ b/target/linux/generic-2.4/patches/601-netfilter_ipp2p_0.8.1rc1.patch @@ -1,7 +1,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h 2007-12-15 05:20:05.756168270 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h @@ -0,0 +1,31 @@ +#ifndef __IPT_IPP2P_H +#define __IPT_IPP2P_H @@ -36,9 +36,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_ipp2p.h +#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 2007-12-15 05:19:38.466613124 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:05.764168722 +0100 -@@ -26,6 +26,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in ++++ linux-2.4.35.4/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 ' ECN match support' CONFIG_IP_NF_MATCH_ECN $CONFIG_IP_NF_IPTABLES @@ -48,9 +48,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:19:38.474613582 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:05.764168722 +0100 -@@ -67,6 +67,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile ++++ linux-2.4.35.4/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_MAC) += ipt_mac.o @@ -60,8 +60,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_ipp2p.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_ipp2p.c 2007-12-15 05:20:05.764168722 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_ipp2p.c @@ -0,0 +1,868 @@ +#if defined(MODVERSIONS) +#include <linux/modversions.h> diff --git a/target/linux/generic-2.4/patches/602-netfilter_layer7_2.17_with_pktmatch.patch b/target/linux/generic-2.4/patches/602-netfilter_layer7_2.17_with_pktmatch.patch index cfbca53315..8fb23409ae 100644 --- a/target/linux/generic-2.4/patches/602-netfilter_layer7_2.17_with_pktmatch.patch +++ b/target/linux/generic-2.4/patches/602-netfilter_layer7_2.17_with_pktmatch.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help =================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:19:54.063501941 +0100 -+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:06.024183543 +0100 -@@ -29207,6 +29207,18 @@ +--- linux-2.4.35.4.orig/Documentation/Configure.help ++++ linux-2.4.35.4/Documentation/Configure.help +@@ -29207,6 +29207,18 @@ CONFIG_SOUND_WM97XX If unsure, say N. @@ -23,9 +23,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help # capitalize: AppleTalk, Ethernet, DOS, DMA, FAT, FTP, Internet, 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 2007-12-15 05:19:38.358606970 +0100 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:06.024183543 +0100 -@@ -207,6 +207,17 @@ +--- 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 +@@ -207,6 +207,17 @@ struct ip_conntrack } nat; #endif /* CONFIG_IP_NF_NAT_NEEDED */ @@ -45,8 +45,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h /* get master conntrack via master expectation */ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_layer7.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_layer7.h 2007-12-15 05:20:06.032183998 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_layer7.h @@ -0,0 +1,27 @@ +/* + By Matthew Strait <quadong@users.sf.net>, Dec 2003. @@ -77,9 +77,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_layer7.h +#endif /* _IPT_LAYER7_H */ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:05.764168722 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:06.036184227 +0100 -@@ -44,6 +44,9 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in ++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +@@ -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 @@ -91,9 +91,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in dep_tristate ' Packet filtering' CONFIG_IP_NF_FILTER $CONFIG_IP_NF_IPTABLES Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:05.764168722 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:06.036184227 +0100 -@@ -87,6 +87,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile ++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile +@@ -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 @@ -103,9 +103,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.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 2007-12-15 05:19:38.386608565 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c 2007-12-15 05:20:06.036184227 +0100 -@@ -346,6 +346,14 @@ +--- 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 +@@ -346,6 +346,14 @@ destroy_conntrack(struct nf_conntrack *n } kfree(ct->master); } @@ -122,9 +122,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c if (master) 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 2007-12-15 05:19:38.394609023 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c 2007-12-15 05:20:06.036184227 +0100 -@@ -107,6 +107,13 @@ +--- 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 +@@ -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)); @@ -140,8 +140,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c return len; Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_layer7.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_layer7.c 2007-12-15 05:20:06.040184453 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_layer7.c @@ -0,0 +1,595 @@ +/* + Kernel module to match application layer (OSI layer 7) @@ -740,8 +740,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_layer7.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.c 2007-12-15 05:20:06.040184453 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.c @@ -0,0 +1,1195 @@ +/* + * regcomp and regexec -- regsub and regerror are elsewhere @@ -1940,8 +1940,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.c + Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.h 2007-12-15 05:20:06.040184453 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.h @@ -0,0 +1,40 @@ +/* + * Definitions etc. for regexp(3) routines. @@ -1985,8 +1985,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.h +#endif Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regmagic.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regmagic.h 2007-12-15 05:20:06.040184453 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regmagic.h @@ -0,0 +1,5 @@ +/* + * The first byte of the regexp internal "program" is actually this magic @@ -1995,8 +1995,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regmagic.h +#define MAGIC 0234 Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regsub.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regsub.c 2007-12-15 05:20:06.044184683 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regsub.c @@ -0,0 +1,95 @@ +/* + * regsub diff --git a/target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch b/target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch index dd1bc1ca5e..b635f41a17 100644 --- a/target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch +++ b/target/linux/generic-2.4/patches/603-netfilter_nat_pptp.patch @@ -1,8 +1,8 @@ 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 2007-12-15 05:20:06.024183543 +0100 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:06.392204515 +0100 -@@ -50,16 +50,19 @@ +--- 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 +@@ -50,16 +50,19 @@ enum ip_conntrack_status { #include <linux/netfilter_ipv4/ip_conntrack_tcp.h> #include <linux/netfilter_ipv4/ip_conntrack_icmp.h> @@ -22,7 +22,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h }; /* Add protocol helper include file here */ -@@ -67,6 +70,7 @@ +@@ -67,6 +70,7 @@ union ip_conntrack_expect_proto { #include <linux/netfilter_ipv4/ip_conntrack_ftp.h> #include <linux/netfilter_ipv4/ip_conntrack_irc.h> @@ -30,7 +30,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h /* per expectation: application helper private data */ union ip_conntrack_expect_help { -@@ -74,6 +78,7 @@ +@@ -74,6 +78,7 @@ union ip_conntrack_expect_help { struct ip_ct_amanda_expect exp_amanda_info; struct ip_ct_ftp_expect exp_ftp_info; struct ip_ct_irc_expect exp_irc_info; @@ -38,7 +38,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h #ifdef CONFIG_IP_NF_NAT_NEEDED union { -@@ -87,14 +92,17 @@ +@@ -87,14 +92,17 @@ union ip_conntrack_help { /* insert conntrack helper private data (master) here */ struct ip_ct_ftp_master ct_ftp_info; struct ip_ct_irc_master ct_irc_info; @@ -58,8 +58,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h 2007-12-15 05:20:06.400204969 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h @@ -0,0 +1,313 @@ +/* PPTP constants and structs */ +#ifndef _CONNTRACK_PPTP_H @@ -376,8 +376,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_pptp.h +#endif /* _CONNTRACK_PPTP_H */ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h 2007-12-15 05:20:06.400204969 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h @@ -0,0 +1,123 @@ +#ifndef _CONNTRACK_PROTO_GRE_H +#define _CONNTRACK_PROTO_GRE_H @@ -504,8 +504,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h +#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 2007-12-15 05:19:38.250600816 +0100 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2007-12-15 05:20:06.400204969 +0100 +--- 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 @@ -14,7 +14,7 @@ union ip_conntrack_manip_proto { @@ -515,7 +515,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h struct { u_int16_t port; -@@ -25,6 +25,9 @@ +@@ -25,6 +25,9 @@ union ip_conntrack_manip_proto struct { u_int16_t id; } icmp; @@ -525,7 +525,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h }; /* The manipulable part of the tuple. */ -@@ -44,7 +47,7 @@ +@@ -44,7 +47,7 @@ struct ip_conntrack_tuple u_int32_t ip; union { /* Add other protocols here. */ @@ -534,7 +534,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h struct { u_int16_t port; -@@ -55,6 +58,9 @@ +@@ -55,6 +58,9 @@ struct ip_conntrack_tuple struct { u_int8_t type, code; } icmp; @@ -544,7 +544,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h } u; /* The protocol. */ -@@ -80,10 +86,16 @@ +@@ -80,10 +86,16 @@ enum ip_conntrack_dir #ifdef __KERNEL__ #define DUMP_TUPLE(tp) \ @@ -566,8 +566,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_tuple.h Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat_pptp.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat_pptp.h 2007-12-15 05:20:06.400204969 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat_pptp.h @@ -0,0 +1,11 @@ +/* PPTP constants and structs */ +#ifndef _NAT_PPTP_H @@ -582,9 +582,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_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 2007-12-15 05:20:06.036184227 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:06.400204969 +0100 -@@ -10,6 +10,8 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in ++++ linux-2.4.35.4/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 dep_tristate ' IRC protocol support' CONFIG_IP_NF_IRC $CONFIG_IP_NF_CONNTRACK @@ -593,7 +593,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then -@@ -63,6 +65,20 @@ +@@ -63,6 +65,20 @@ 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 dep_tristate ' REDIRECT target support' CONFIG_IP_NF_TARGET_REDIRECT $CONFIG_IP_NF_NAT @@ -616,9 +616,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in 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 2007-12-15 05:20:06.036184227 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c 2007-12-15 05:20:06.404205198 +0100 -@@ -143,6 +143,8 @@ +--- 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 +@@ -143,6 +143,8 @@ ip_ct_get_tuple(const struct iphdr *iph, tuple->dst.ip = iph->daddr; tuple->dst.protonum = iph->protocol; @@ -627,7 +627,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c ret = protocol->pkt_to_tuple((u_int32_t *)iph + iph->ihl, len - 4*iph->ihl, tuple); -@@ -158,6 +160,8 @@ +@@ -158,6 +160,8 @@ invert_tuple(struct ip_conntrack_tuple * inverse->dst.ip = orig->src.ip; inverse->dst.protonum = orig->dst.protonum; @@ -636,7 +636,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c return protocol->invert_tuple(inverse, orig); } -@@ -970,8 +974,8 @@ +@@ -970,8 +974,8 @@ int ip_conntrack_expect_related(struct i * so there is no need to use the tuple lock too */ DEBUGP("ip_conntrack_expect_related %p\n", related_to); @@ -647,7 +647,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c old = LIST_FIND(&ip_conntrack_expect_list, resent_expect, struct ip_conntrack_expect *, &expect->tuple, -@@ -1089,15 +1093,14 @@ +@@ -1089,15 +1093,14 @@ int ip_conntrack_change_expect(struct ip MUST_BE_READ_LOCKED(&ip_conntrack_lock); WRITE_LOCK(&ip_conntrack_expect_tuple_lock); @@ -669,8 +669,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c /* Force NAT to find an unused tuple */ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h 2007-12-15 05:20:06.404205198 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h @@ -0,0 +1,24 @@ +#ifndef _IP_CT_PPTP_PRIV_H +#define _IP_CT_PPTP_PRIV_H @@ -698,8 +698,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp_priv.h +#endif Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c 2007-12-15 05:20:06.404205198 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c @@ -0,0 +1,333 @@ +/* + * ip_conntrack_proto_gre.c - Version 1.2 @@ -1036,9 +1036,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c +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 2007-12-15 05:19:38.290603095 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c 2007-12-15 05:20:06.404205198 +0100 -@@ -424,7 +424,7 @@ +--- 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 +@@ -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)) != NULL) { @@ -1047,7 +1047,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c /* 3) The per-protocol part of the manip is made to map into the range to make a unique tuple. */ -@@ -564,9 +564,9 @@ +@@ -564,9 +564,9 @@ ip_nat_setup_info(struct ip_conntrack *c HOOK2MANIP(hooknum)==IP_NAT_MANIP_SRC ? "SRC" : "DST", conntrack); DEBUGP("Original: "); @@ -1061,8 +1061,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c /* We now have two tuples (SRCIP/SRCPT/DSTIP/DSTPT): Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c 2007-12-15 05:20:06.408205428 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c @@ -0,0 +1,482 @@ +/* + * ip_nat_pptp.c - Version 1.5 @@ -1548,8 +1548,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_pptp.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c 2007-12-15 05:20:06.408205428 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c @@ -0,0 +1,202 @@ +/* + * ip_nat_proto_gre.c - Version 1.2 @@ -1755,9 +1755,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_proto_gre.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:06.036184227 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:06.408205428 +0100 -@@ -36,23 +36,32 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile ++++ linux-2.4.35.4/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 endif @@ -1794,8 +1794,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp.c 2007-12-15 05:20:06.408205428 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_pptp.c @@ -0,0 +1,635 @@ +/* + * ip_conntrack_pptp.c - Version 1.9 diff --git a/target/linux/generic-2.4/patches/604-netfilter_maxconn.patch b/target/linux/generic-2.4/patches/604-netfilter_maxconn.patch index d0b3816557..cbf61e7113 100644 --- a/target/linux/generic-2.4/patches/604-netfilter_maxconn.patch +++ b/target/linux/generic-2.4/patches/604-netfilter_maxconn.patch @@ -1,8 +1,8 @@ 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 2007-12-15 05:20:06.404205198 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c 2007-12-15 05:20:06.772226171 +0100 -@@ -1410,7 +1410,7 @@ +--- 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 +@@ -1410,7 +1410,7 @@ void ip_conntrack_cleanup(void) nf_unregister_sockopt(&so_getorigdst); } @@ -11,7 +11,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c MODULE_PARM(hashsize, "i"); int __init ip_conntrack_init(void) -@@ -1431,7 +1431,7 @@ +@@ -1431,7 +1431,7 @@ int __init ip_conntrack_init(void) if (ip_conntrack_htable_size < 16) ip_conntrack_htable_size = 16; } diff --git a/target/linux/generic-2.4/patches/605-netfilter_TTL.patch b/target/linux/generic-2.4/patches/605-netfilter_TTL.patch index d42436041e..4e297b1b9d 100644 --- a/target/linux/generic-2.4/patches/605-netfilter_TTL.patch +++ b/target/linux/generic-2.4/patches/605-netfilter_TTL.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help =================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:20:06.024183543 +0100 -+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:06.996238934 +0100 -@@ -3209,6 +3209,15 @@ +--- linux-2.4.35.4.orig/Documentation/Configure.help ++++ linux-2.4.35.4/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'. @@ -20,8 +20,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help This option places ipchains (with masquerading and redirection Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_TTL.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_TTL.h 2007-12-15 05:20:07.000239163 +0100 +--- /dev/null ++++ linux-2.4.35.4/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> */ @@ -46,9 +46,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_TTL.h +#endif Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:06.400204969 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:07.000239163 +0100 -@@ -125,6 +125,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in ++++ linux-2.4.35.4/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 ' LOG target support' CONFIG_IP_NF_TARGET_LOG $CONFIG_IP_NF_IPTABLES @@ -58,8 +58,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in fi Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c 2007-12-15 05:20:07.000239163 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c @@ -0,0 +1,110 @@ +/* TTL modification target for IP tables + * (C) 2000 by Harald Welte <laforge@gnumonks.org> @@ -173,9 +173,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_TTL.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:06.408205428 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:07.000239163 +0100 -@@ -109,6 +109,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile ++++ linux-2.4.35.4/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 obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o diff --git a/target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch b/target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch index 1e4b944337..c0e3cfaa9e 100644 --- a/target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch +++ b/target/linux/generic-2.4/patches/606-netfilter_NETMAP.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help =================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:20:06.996238934 +0100 -+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:07.284255349 +0100 -@@ -3086,6 +3086,17 @@ +--- linux-2.4.35.4.orig/Documentation/Configure.help ++++ linux-2.4.35.4/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'. @@ -22,9 +22,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help 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 2007-12-15 05:20:07.000239163 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:07.284255349 +0100 -@@ -65,6 +65,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in ++++ linux-2.4.35.4/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 dep_tristate ' REDIRECT target support' CONFIG_IP_NF_TARGET_REDIRECT $CONFIG_IP_NF_NAT @@ -34,8 +34,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in else Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c 2007-12-15 05:20:07.284255349 +0100 +--- /dev/null ++++ linux-2.4.35.4/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), @@ -151,9 +151,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_NETMAP.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:07.000239163 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:07.288255579 +0100 -@@ -107,6 +107,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile ++++ linux-2.4.35.4/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 obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o diff --git a/target/linux/generic-2.4/patches/607-netfilter_connmark.patch b/target/linux/generic-2.4/patches/607-netfilter_connmark.patch index 7641f5bdc8..cbc5f93c05 100644 --- a/target/linux/generic-2.4/patches/607-netfilter_connmark.patch +++ b/target/linux/generic-2.4/patches/607-netfilter_connmark.patch @@ -1,8 +1,8 @@ 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 2007-12-15 05:20:06.392204515 +0100 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:07.552270623 +0100 -@@ -226,6 +226,9 @@ +--- 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 +@@ -226,6 +226,9 @@ struct ip_conntrack unsigned int app_data_len; } layer7; #endif @@ -14,8 +14,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h /* get master conntrack via master expectation */ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h 2007-12-15 05:20:07.556270849 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h @@ -0,0 +1,25 @@ +#ifndef _IPT_CONNMARK_H_target +#define _IPT_CONNMARK_H_target @@ -44,8 +44,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CONNMARK.h +#endif /*_IPT_CONNMARK_H_target*/ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connmark.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connmark.h 2007-12-15 05:20:07.564271306 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connmark.h @@ -0,0 +1,18 @@ +#ifndef _IPT_CONNMARK_H +#define _IPT_CONNMARK_H @@ -67,9 +67,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/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 2007-12-15 05:20:07.284255349 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:07.568271536 +0100 -@@ -6,7 +6,8 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in ++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +@@ -6,7 +6,8 @@ comment ' IP: Netfilter Configuration' tristate 'Connection tracking (required for masq/NAT)' CONFIG_IP_NF_CONNTRACK if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; then @@ -79,7 +79,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in 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 ' IRC protocol support' CONFIG_IP_NF_IRC $CONFIG_IP_NF_CONNTRACK -@@ -42,6 +43,9 @@ +@@ -42,6 +43,9 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; then dep_tristate ' Connection state match support' CONFIG_IP_NF_MATCH_STATE $CONFIG_IP_NF_CONNTRACK $CONFIG_IP_NF_IPTABLES dep_tristate ' Connection tracking match support' CONFIG_IP_NF_MATCH_CONNTRACK $CONFIG_IP_NF_CONNTRACK $CONFIG_IP_NF_IPTABLES @@ -89,7 +89,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then dep_tristate ' Unclean match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_UNCLEAN $CONFIG_IP_NF_IPTABLES -@@ -125,6 +129,9 @@ +@@ -125,6 +129,9 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; dep_tristate ' MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE fi @@ -101,9 +101,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in 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 2007-12-15 05:20:07.288255579 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:07.568271536 +0100 -@@ -93,6 +93,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile ++++ linux-2.4.35.4/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_MATCH_STATE) += ipt_state.o @@ -111,7 +111,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile 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 -@@ -110,6 +111,7 @@ +@@ -110,6 +111,7 @@ obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += i obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o @@ -121,9 +121,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile 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 2007-12-15 05:20:06.772226171 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c 2007-12-15 05:20:07.568271536 +0100 -@@ -754,6 +754,9 @@ +--- 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 +@@ -754,6 +754,9 @@ init_conntrack(const struct ip_conntrack __set_bit(IPS_EXPECTED_BIT, &conntrack->status); conntrack->master = expected; expected->sibling = conntrack; @@ -135,9 +135,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c 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 2007-12-15 05:20:06.036184227 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c 2007-12-15 05:20:07.568271536 +0100 -@@ -107,6 +107,9 @@ +--- 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 +@@ -107,6 +107,9 @@ print_conntrack(char *buffer, struct ip_ len += sprintf(buffer + len, "[ASSURED] "); len += sprintf(buffer + len, "use=%u ", atomic_read(&conntrack->ct_general.use)); @@ -149,8 +149,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c if(conntrack->layer7.app_proto) Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CONNMARK.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_CONNMARK.c 2007-12-15 05:20:07.568271536 +0100 +--- /dev/null ++++ linux-2.4.35.4/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 @@ -272,8 +272,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CONNMARK.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_connmark.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_connmark.c 2007-12-15 05:20:07.572271763 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_connmark.c @@ -0,0 +1,83 @@ +/* This kernel module matches connection mark values set by the + * CONNMARK target diff --git a/target/linux/generic-2.4/patches/608-netfilter_ipset.patch b/target/linux/generic-2.4/patches/608-netfilter_ipset.patch index 915f39f089..1338a056dd 100644 --- a/target/linux/generic-2.4/patches/608-netfilter_ipset.patch +++ b/target/linux/generic-2.4/patches/608-netfilter_ipset.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help =================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:20:07.284255349 +0100 -+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:07.880289314 +0100 -@@ -3220,6 +3220,75 @@ +--- linux-2.4.35.4.orig/Documentation/Configure.help ++++ linux-2.4.35.4/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'. @@ -80,8 +80,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help 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 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set.h 2007-12-15 05:20:07.884289543 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set.h @@ -0,0 +1,489 @@ +#ifndef _IP_SET_H +#define _IP_SET_H @@ -574,8 +574,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set.h +#endif /*_IP_SET_H*/ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iphash.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iphash.h 2007-12-15 05:20:07.884289543 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iphash.h @@ -0,0 +1,30 @@ +#ifndef __IP_SET_IPHASH_H +#define __IP_SET_IPHASH_H @@ -609,8 +609,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/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 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipmap.h 2007-12-15 05:20:07.884289543 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipmap.h @@ -0,0 +1,56 @@ +#ifndef __IP_SET_IPMAP_H +#define __IP_SET_IPMAP_H @@ -670,8 +670,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/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 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iptree.h 2007-12-15 05:20:07.884289543 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_iptree.h @@ -0,0 +1,39 @@ +#ifndef __IP_SET_IPTREE_H +#define __IP_SET_IPTREE_H @@ -714,8 +714,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/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 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_jhash.h 2007-12-15 05:20:07.884289543 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_jhash.h @@ -0,0 +1,148 @@ +#ifndef _LINUX_IPSET_JHASH_H +#define _LINUX_IPSET_JHASH_H @@ -867,8 +867,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_jhash.h +#endif /* _LINUX_IPSET_JHASH_H */ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_macipmap.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_macipmap.h 2007-12-15 05:20:07.884289543 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_macipmap.h @@ -0,0 +1,38 @@ +#ifndef __IP_SET_MACIPMAP_H +#define __IP_SET_MACIPMAP_H @@ -910,8 +910,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/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 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_malloc.h 2007-12-15 05:20:07.888289773 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_malloc.h @@ -0,0 +1,27 @@ +#ifndef _IP_SET_MALLOC_H +#define _IP_SET_MALLOC_H @@ -942,8 +942,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_malloc.h +#endif /*_IP_SET_MALLOC_H*/ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_nethash.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_nethash.h 2007-12-15 05:20:07.888289773 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_nethash.h @@ -0,0 +1,55 @@ +#ifndef __IP_SET_NETHASH_H +#define __IP_SET_NETHASH_H @@ -1002,8 +1002,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/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 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_portmap.h 2007-12-15 05:20:07.888289773 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_portmap.h @@ -0,0 +1,25 @@ +#ifndef __IP_SET_PORTMAP_H +#define __IP_SET_PORTMAP_H @@ -1032,8 +1032,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/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 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_prime.h 2007-12-15 05:20:07.888289773 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_prime.h @@ -0,0 +1,34 @@ +#ifndef __IP_SET_PRIME_H +#define __IP_SET_PRIME_H @@ -1071,8 +1071,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_prime.h +#endif /* __IP_SET_PRIME_H */ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_set.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_set.h 2007-12-15 05:20:07.888289773 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_set.h @@ -0,0 +1,21 @@ +#ifndef _IPT_SET_H +#define _IPT_SET_H @@ -1097,9 +1097,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/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 2007-12-15 05:20:07.568271536 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:07.892290000 +0100 -@@ -22,6 +22,20 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in ++++ linux-2.4.35.4/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 ' limit match support' CONFIG_IP_NF_MATCH_LIMIT $CONFIG_IP_NF_IPTABLES @@ -1122,8 +1122,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in 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 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set.c 2007-12-15 05:20:07.892290000 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ip_set.c @@ -0,0 +1,2002 @@ +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> + * Patrick Schaaf <bof@bof.de> @@ -3129,8 +3129,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c 2007-12-15 05:20:07.896290225 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c @@ -0,0 +1,379 @@ +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> + * @@ -3513,8 +3513,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iphash.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_ipmap.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_ipmap.c 2007-12-15 05:20:07.896290225 +0100 +--- /dev/null ++++ linux-2.4.35.4/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> @@ -3832,8 +3832,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_ipmap.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c 2007-12-15 05:20:07.896290225 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c @@ -0,0 +1,511 @@ +/* Copyright (C) 2005 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> + * @@ -4348,8 +4348,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_iptree.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_macipmap.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_macipmap.c 2007-12-15 05:20:07.896290225 +0100 +--- /dev/null ++++ linux-2.4.35.4/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> @@ -4693,8 +4693,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_macipmap.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c 2007-12-15 05:20:07.900290454 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c @@ -0,0 +1,450 @@ +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> + * @@ -5148,8 +5148,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_nethash.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c 2007-12-15 05:20:07.900290454 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c @@ -0,0 +1,321 @@ +/* Copyright (C) 2003-2004 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> + * @@ -5474,8 +5474,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_set_portmap.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c 2007-12-15 05:20:07.900290454 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c @@ -0,0 +1,114 @@ +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> + * Patrick Schaaf <bof@bof.de> @@ -5593,8 +5593,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_set.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c 2007-12-15 05:20:07.900290454 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c @@ -0,0 +1,127 @@ +/* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu> + * Patrick Schaaf <bof@bof.de> @@ -5725,9 +5725,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_SET.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:07.568271536 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:07.900290454 +0100 -@@ -75,6 +75,18 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile ++++ linux-2.4.35.4/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 obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o diff --git a/target/linux/generic-2.4/patches/609-netfilter_string.patch b/target/linux/generic-2.4/patches/609-netfilter_string.patch index 1f13da2a2f..040ef48ebe 100644 --- a/target/linux/generic-2.4/patches/609-netfilter_string.patch +++ b/target/linux/generic-2.4/patches/609-netfilter_string.patch @@ -1,7 +1,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_string.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_string.h 2007-12-15 05:20:08.388318268 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_string.h @@ -0,0 +1,18 @@ +#ifndef _IPT_STRING_H +#define _IPT_STRING_H @@ -23,9 +23,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/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 2007-12-15 05:20:07.892290000 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:08.396318720 +0100 -@@ -63,6 +63,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in ++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +@@ -63,6 +63,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then dep_tristate ' Unclean match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_UNCLEAN $CONFIG_IP_NF_IPTABLES @@ -35,8 +35,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in 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 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_string.c 2007-12-15 05:20:08.400318949 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_string.c @@ -0,0 +1,99 @@ +/* String matching match for iptables + * @@ -139,9 +139,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_string.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:07.900290454 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:08.400318949 +0100 -@@ -108,6 +108,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile ++++ linux-2.4.35.4/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_UNCLEAN) += ipt_unclean.o @@ -151,8 +151,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c 2007-12-15 05:20:08.400318949 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c @@ -0,0 +1,305 @@ +/* + * lib/textsearch.c Generic text search interface @@ -461,8 +461,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.c + Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h 2007-12-15 05:20:08.400318949 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h @@ -0,0 +1,182 @@ +#ifndef __LINUX_TEXTSEARCH_H +#define __LINUX_TEXTSEARCH_H @@ -648,8 +648,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/textsearch.h +#endif Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c 2007-12-15 05:20:08.400318949 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c @@ -0,0 +1,190 @@ +/* + * lib/ts_bm.c Boyer-Moore text search implementation @@ -843,8 +843,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_bm.c +} Index: linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_kmp.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_kmp.c 2007-12-15 05:20:08.404319178 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/textsearch/ts_kmp.c @@ -0,0 +1,141 @@ +/* + * lib/ts_kmp.c Knuth-Morris-Pratt text search implementation diff --git a/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch b/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch index f903bc9ea2..42932f7276 100644 --- a/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch +++ b/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:08.396318720 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:08.692335591 +0100 -@@ -11,6 +11,8 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in ++++ linux-2.4.35.4/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 ' IRC protocol support' CONFIG_IP_NF_IRC $CONFIG_IP_NF_CONNTRACK @@ -13,9 +13,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in fi Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:08.400318949 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:08.696335817 +0100 -@@ -106,6 +106,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile ++++ linux-2.4.35.4/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_CONNMARK) += ipt_connmark.o @@ -25,9 +25,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile 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 2007-12-15 05:19:37.650566622 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_amanda.c 2007-12-15 05:20:08.700336046 +0100 -@@ -75,7 +75,7 @@ +--- 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 +@@ -75,7 +75,7 @@ static int help(const struct iphdr *iph, /* increase the UDP timeout of the master connection as replies from * Amanda clients to the server can be quite delayed */ @@ -38,9 +38,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_amanda.c 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 2007-12-15 05:19:37.658567077 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_tcp.c 2007-12-15 05:20:08.700336046 +0100 -@@ -211,7 +211,7 @@ +--- 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 +@@ -211,7 +211,7 @@ static int tcp_packet(struct ip_conntrac set_bit(IPS_ASSURED_BIT, &conntrack->status); WRITE_UNLOCK(&tcp_lock); @@ -51,9 +51,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_tcp.c 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 2007-12-15 05:19:37.666567533 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_udp.c 2007-12-15 05:20:08.700336046 +0100 -@@ -47,16 +47,16 @@ +--- 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 +@@ -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, struct iphdr *iph, size_t len, @@ -75,9 +75,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_udp.c } 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 2007-12-15 05:20:07.568271536 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c 2007-12-15 05:20:08.700336046 +0100 -@@ -79,6 +79,18 @@ +--- 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 +@@ -79,6 +79,18 @@ print_expect(char *buffer, const struct return len; } @@ -96,7 +96,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c static unsigned int print_conntrack(char *buffer, struct ip_conntrack *conntrack) { -@@ -98,11 +110,15 @@ +@@ -98,11 +110,15 @@ print_conntrack(char *buffer, struct ip_ len += print_tuple(buffer + len, &conntrack->tuplehash[IP_CT_DIR_ORIGINAL].tuple, proto); @@ -112,7 +112,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c if (test_bit(IPS_ASSURED_BIT, &conntrack->status)) len += sprintf(buffer + len, "[ASSURED] "); len += sprintf(buffer + len, "use=%u ", -@@ -478,7 +494,7 @@ +@@ -478,7 +494,7 @@ EXPORT_SYMBOL(ip_conntrack_get); EXPORT_SYMBOL(ip_conntrack_helper_register); EXPORT_SYMBOL(ip_conntrack_helper_unregister); EXPORT_SYMBOL(ip_ct_iterate_cleanup); @@ -123,9 +123,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c 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 2007-12-15 05:19:37.682568446 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_generic.c 2007-12-15 05:20:08.700336046 +0100 -@@ -41,9 +41,9 @@ +--- 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 +@@ -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, struct iphdr *iph, size_t len, @@ -139,9 +139,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_generic.c 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 2007-12-15 05:19:37.686568672 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_icmp.c 2007-12-15 05:20:08.704336275 +0100 -@@ -82,7 +82,7 @@ +--- 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 +@@ -82,7 +82,7 @@ static int icmp_packet(struct ip_conntra ct->timeout.function((unsigned long)ct); } else { atomic_inc(&ct->proto.icmp.count); @@ -152,9 +152,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_icmp.c 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 2007-12-15 05:20:07.568271536 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c 2007-12-15 05:20:08.704336275 +0100 -@@ -1196,22 +1196,40 @@ +--- 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 +@@ -1196,22 +1196,40 @@ void ip_conntrack_helper_unregister(stru MOD_DEC_USE_COUNT; } @@ -200,9 +200,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c } 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 2007-12-15 05:20:07.552270623 +0100 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:08.704336275 +0100 -@@ -164,6 +164,12 @@ +--- 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 +@@ -164,6 +164,12 @@ struct ip_conntrack_expect union ip_conntrack_expect_help help; }; @@ -215,7 +215,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h struct ip_conntrack_helper; struct ip_conntrack -@@ -181,6 +187,12 @@ +@@ -181,6 +187,12 @@ struct ip_conntrack /* Timer function; drops refcnt when it goes off. */ struct timer_list timeout; @@ -228,7 +228,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h /* If we're expecting another related connection, this will be in expected linked list */ struct list_head sibling_list; -@@ -264,8 +276,10 @@ +@@ -264,8 +276,10 @@ extern int invert_tuplepr(struct ip_conn const struct ip_conntrack_tuple *orig); /* Refresh conntrack for this many jiffies */ @@ -243,8 +243,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h /* Call me when a conntrack is destroyed. */ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_connbytes.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_connbytes.c 2007-12-15 05:20:08.704336275 +0100 +--- /dev/null ++++ linux-2.4.35.4/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). @@ -411,8 +411,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_connbytes.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connbytes.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connbytes.h 2007-12-15 05:20:08.708336505 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_connbytes.h @@ -0,0 +1,25 @@ +#ifndef _IPT_CONNBYTES_H +#define _IPT_CONNBYTES_H @@ -441,9 +441,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/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 2007-12-15 05:20:06.404205198 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_proto_gre.c 2007-12-15 05:20:08.708336505 +0100 -@@ -237,16 +237,16 @@ +--- 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 +@@ -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, struct iphdr *iph, size_t len, diff --git a/target/linux/generic-2.4/patches/611-netfilter_condition.patch b/target/linux/generic-2.4/patches/611-netfilter_condition.patch index 0b5363a442..c6ffe5b325 100644 --- a/target/linux/generic-2.4/patches/611-netfilter_condition.patch +++ b/target/linux/generic-2.4/patches/611-netfilter_condition.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help =================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:20:07.880289314 +0100 -+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:09.280369103 +0100 -@@ -2979,6 +2979,14 @@ +--- linux-2.4.35.4.orig/Documentation/Configure.help ++++ linux-2.4.35.4/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'. @@ -17,7 +17,7 @@ Index: linux-2.4.35.4/Documentation/Configure.help conntrack match support CONFIG_IP_NF_MATCH_CONNTRACK This is a general conntrack match module, a superset of the state match. -@@ -3354,6 +3362,14 @@ +@@ -3354,6 +3362,14 @@ CONFIG_IP6_NF_MATCH_MARK If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. If unsure, say `N'. @@ -34,8 +34,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help 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 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_condition.h 2007-12-15 05:20:09.296370013 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_condition.h @@ -0,0 +1,11 @@ +#ifndef __IPT_CONDITION_MATCH__ +#define __IPT_CONDITION_MATCH__ @@ -50,8 +50,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_condition.h +#endif Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h 2007-12-15 05:20:09.300370243 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h @@ -0,0 +1,11 @@ +#ifndef __IP6T_CONDITION_MATCH__ +#define __IP6T_CONDITION_MATCH__ @@ -66,9 +66,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_condition.h +#endif Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:08.692335591 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:09.300370243 +0100 -@@ -43,6 +43,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in ++++ linux-2.4.35.4/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 ' TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES @@ -78,9 +78,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in 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 2007-12-15 05:20:08.696335817 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:09.300370243 +0100 -@@ -94,6 +94,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile ++++ linux-2.4.35.4/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_TOS) += ipt_tos.o @@ -90,8 +90,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c 2007-12-15 05:20:09.300370243 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c @@ -0,0 +1,256 @@ +/*-------------------------------------------*\ +| Netfilter Condition Module | @@ -351,9 +351,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_condition.c +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 2007-12-15 05:19:37.590563202 +0100 -+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in 2007-12-15 05:20:09.300370243 +0100 -@@ -17,6 +17,7 @@ +--- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in ++++ linux-2.4.35.4/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 ' limit match support' CONFIG_IP6_NF_MATCH_LIMIT $CONFIG_IP6_NF_IPTABLES @@ -363,9 +363,9 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in 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 2007-12-15 05:19:37.598563658 +0100 -+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile 2007-12-15 05:20:09.304370470 +0100 -@@ -14,6 +14,7 @@ +--- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile ++++ linux-2.4.35.4/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_LIMIT) += ip6t_limit.o @@ -375,8 +375,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile obj-$(CONFIG_IP6_NF_MATCH_MAC) += ip6t_mac.o Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_condition.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_condition.c 2007-12-15 05:20:09.304370470 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_condition.c @@ -0,0 +1,254 @@ +/*-------------------------------------------*\ +| Netfilter Condition Module for IPv6 | diff --git a/target/linux/generic-2.4/patches/612-netfilter_quota.patch b/target/linux/generic-2.4/patches/612-netfilter_quota.patch index 65c32c5929..6e5f75d3d3 100644 --- a/target/linux/generic-2.4/patches/612-netfilter_quota.patch +++ b/target/linux/generic-2.4/patches/612-netfilter_quota.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help =================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:20:09.280369103 +0100 -+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:09.632389161 +0100 -@@ -2888,6 +2888,13 @@ +--- linux-2.4.35.4.orig/Documentation/Configure.help ++++ linux-2.4.35.4/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'. @@ -18,8 +18,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help This patch allows you to match packet in accrodance Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_quota.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_quota.h 2007-12-15 05:20:09.636389390 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_quota.h @@ -0,0 +1,12 @@ +#ifndef _IPT_QUOTA_H +#define _IPT_QUOTA_H @@ -35,9 +35,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/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 2007-12-15 05:20:09.300370243 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:09.644389846 +0100 -@@ -24,6 +24,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in ++++ linux-2.4.35.4/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 ' limit match support' CONFIG_IP_NF_MATCH_LIMIT $CONFIG_IP_NF_IPTABLES @@ -47,9 +47,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in 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 2007-12-15 05:20:09.300370243 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:09.644389846 +0100 -@@ -74,6 +74,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile ++++ linux-2.4.35.4/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_LIMIT) += ipt_limit.o @@ -59,8 +59,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_TARGET_SET) += ipt_SET.o Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_quota.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_quota.c 2007-12-15 05:20:09.644389846 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_quota.c @@ -0,0 +1,88 @@ +/* + * netfilter module to enforce network quotas diff --git a/target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch b/target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch index 553d1151d0..996b21fb4b 100644 --- a/target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch +++ b/target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:09.644389846 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:09.916405347 +0100 -@@ -15,6 +15,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in ++++ linux-2.4.35.4/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 dep_tristate ' PPTP protocol support' CONFIG_IP_NF_PPTP $CONFIG_IP_NF_CT_PROTO_GRE @@ -10,7 +10,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then -@@ -110,6 +111,13 @@ +@@ -110,6 +111,13 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; define_tristate CONFIG_IP_NF_NAT_AMANDA $CONFIG_IP_NF_NAT fi fi @@ -26,9 +26,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in fi Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:09.644389846 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:09.916405347 +0100 -@@ -53,6 +53,10 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile ++++ linux-2.4.35.4/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 endif @@ -39,7 +39,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile # NAT helpers -@@ -62,6 +66,7 @@ +@@ -62,6 +66,7 @@ obj-$(CONFIG_IP_NF_NAT_FTP) += ip_nat_ft obj-$(CONFIG_IP_NF_NAT_IRC) += ip_nat_irc.o obj-$(CONFIG_IP_NF_NAT_PROTO_GRE) += ip_nat_proto_gre.o obj-$(CONFIG_IP_NF_NAT_PPTP) += ip_nat_pptp.o @@ -49,8 +49,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c 2007-12-15 05:20:09.920405577 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c @@ -0,0 +1,302 @@ +/* + * H.323 'brute force' extension for H.323 connection tracking. @@ -356,8 +356,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_h323.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c 2007-12-15 05:20:09.920405577 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c @@ -0,0 +1,403 @@ +/* + * H.323 'brute force' extension for NAT alteration. @@ -764,9 +764,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_h323.c +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 2007-12-15 05:20:08.704336275 +0100 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:09.920405577 +0100 -@@ -71,6 +71,7 @@ +--- 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 +@@ -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> #include <linux/netfilter_ipv4/ip_conntrack_pptp.h> @@ -774,7 +774,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h /* per expectation: application helper private data */ union ip_conntrack_expect_help { -@@ -79,6 +80,7 @@ +@@ -79,6 +80,7 @@ union ip_conntrack_expect_help { struct ip_ct_ftp_expect exp_ftp_info; struct ip_ct_irc_expect exp_irc_info; struct ip_ct_pptp_expect exp_pptp_info; @@ -782,7 +782,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h #ifdef CONFIG_IP_NF_NAT_NEEDED union { -@@ -93,6 +95,7 @@ +@@ -93,6 +95,7 @@ union ip_conntrack_help { struct ip_ct_ftp_master ct_ftp_info; struct ip_ct_irc_master ct_irc_info; struct ip_ct_pptp_master ct_pptp_info; @@ -792,8 +792,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h #ifdef CONFIG_IP_NF_NAT_NEEDED Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_h323.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_h323.h 2007-12-15 05:20:09.920405577 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_h323.h @@ -0,0 +1,30 @@ +#ifndef _IP_CONNTRACK_H323_H +#define _IP_CONNTRACK_H323_H diff --git a/target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch b/target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch index 6c0184a55c..7fd2c8b3cb 100644 --- a/target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch +++ b/target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:09.916405347 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:10.196421304 +0100 -@@ -16,6 +16,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in ++++ linux-2.4.35.4/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 dep_tristate ' H.323 (netmeeting) support' CONFIG_IP_NF_H323 $CONFIG_IP_NF_CONNTRACK @@ -10,7 +10,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then -@@ -118,6 +119,13 @@ +@@ -118,6 +119,13 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; define_tristate CONFIG_IP_NF_NAT_H323 $CONFIG_IP_NF_NAT fi fi @@ -26,9 +26,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in fi Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:09.916405347 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:10.196421304 +0100 -@@ -57,6 +57,11 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile ++++ linux-2.4.35.4/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 endif @@ -40,7 +40,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile # NAT helpers -@@ -67,6 +72,7 @@ +@@ -67,6 +72,7 @@ obj-$(CONFIG_IP_NF_NAT_IRC) += ip_nat_ir obj-$(CONFIG_IP_NF_NAT_PROTO_GRE) += ip_nat_proto_gre.o obj-$(CONFIG_IP_NF_NAT_PPTP) += ip_nat_pptp.o obj-$(CONFIG_IP_NF_NAT_H323) += ip_nat_h323.o @@ -50,8 +50,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c 2007-12-15 05:20:10.200421534 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c @@ -0,0 +1,507 @@ +/* + * RTSP extension for IP connection tracking @@ -562,8 +562,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_rtsp.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c 2007-12-15 05:20:10.200421534 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c @@ -0,0 +1,621 @@ +/* + * RTSP extension for TCP NAT alteration @@ -1188,9 +1188,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_rtsp.c +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 2007-12-15 05:19:54.695537960 +0100 -+++ linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c 2007-12-15 05:20:10.200421534 +0100 -@@ -52,6 +52,7 @@ +--- linux-2.4.35.4.orig/arch/mips/kernel/mips_ksyms.c ++++ linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c +@@ -52,6 +52,7 @@ EXPORT_SYMBOL(EISA_bus); /* * String functions */ @@ -1200,8 +1200,8 @@ Index: linux-2.4.35.4/arch/mips/kernel/mips_ksyms.c EXPORT_SYMBOL_NOVERS(memcpy); Index: linux-2.4.35.4/include/linux/netfilter_helpers.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_helpers.h 2007-12-15 05:20:10.200421534 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_helpers.h @@ -0,0 +1,133 @@ +/* + * Helpers for netfiler modules. This file provides implementations for basic @@ -1338,8 +1338,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_helpers.h +#endif /* _NETFILTER_HELPERS_H */ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h 2007-12-15 05:20:10.200421534 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h @@ -0,0 +1,68 @@ +/* + * RTSP extension for IP connection tracking. @@ -1411,8 +1411,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h +#endif /* _IP_CONNTRACK_RTSP_H */ Index: linux-2.4.35.4/include/linux/netfilter_mime.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_mime.h 2007-12-15 05:20:10.204421761 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_mime.h @@ -0,0 +1,90 @@ +/* + * MIME functions for netfilter modules. This file provides implementations @@ -1506,9 +1506,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_mime.h +#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 2007-12-15 05:20:09.920405577 +0100 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:10.204421761 +0100 -@@ -72,6 +72,7 @@ +--- 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 +@@ -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> #include <linux/netfilter_ipv4/ip_conntrack_h323.h> @@ -1516,7 +1516,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h /* per expectation: application helper private data */ union ip_conntrack_expect_help { -@@ -81,6 +82,7 @@ +@@ -81,6 +82,7 @@ union ip_conntrack_expect_help { struct ip_ct_irc_expect exp_irc_info; struct ip_ct_pptp_expect exp_pptp_info; struct ip_ct_h225_expect exp_h225_info; @@ -1524,7 +1524,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h #ifdef CONFIG_IP_NF_NAT_NEEDED union { -@@ -96,6 +98,7 @@ +@@ -96,6 +98,7 @@ union ip_conntrack_help { struct ip_ct_irc_master ct_irc_info; struct ip_ct_pptp_master ct_pptp_info; struct ip_ct_h225_master ct_h225_info; diff --git a/target/linux/generic-2.4/patches/615-netfilter_nat_mms.patch b/target/linux/generic-2.4/patches/615-netfilter_nat_mms.patch index e68e2a974a..8fe407582e 100644 --- a/target/linux/generic-2.4/patches/615-netfilter_nat_mms.patch +++ b/target/linux/generic-2.4/patches/615-netfilter_nat_mms.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:10.196421304 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:10.504438857 +0100 -@@ -17,6 +17,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in ++++ linux-2.4.35.4/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 dep_tristate ' RTSP protocol support' CONFIG_IP_NF_RTSP $CONFIG_IP_NF_CONNTRACK @@ -10,7 +10,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then -@@ -126,6 +127,13 @@ +@@ -126,6 +127,13 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; define_tristate CONFIG_IP_NF_NAT_RTSP $CONFIG_IP_NF_NAT fi fi @@ -26,9 +26,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in fi Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:10.196421304 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:10.508439083 +0100 -@@ -61,6 +61,10 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile ++++ linux-2.4.35.4/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 endif @@ -39,7 +39,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile -@@ -73,6 +77,7 @@ +@@ -73,6 +77,7 @@ obj-$(CONFIG_IP_NF_NAT_PROTO_GRE) += ip_ obj-$(CONFIG_IP_NF_NAT_PPTP) += ip_nat_pptp.o obj-$(CONFIG_IP_NF_NAT_H323) += ip_nat_h323.o obj-$(CONFIG_IP_NF_NAT_RTSP) += ip_nat_rtsp.o @@ -49,8 +49,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_mms.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_mms.c 2007-12-15 05:20:10.516439541 +0100 +--- /dev/null ++++ linux-2.4.35.4/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> @@ -346,8 +346,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_mms.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_mms.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_mms.c 2007-12-15 05:20:10.516439541 +0100 +--- /dev/null ++++ linux-2.4.35.4/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> @@ -681,9 +681,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_mms.c +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 2007-12-15 05:20:10.204421761 +0100 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h 2007-12-15 05:20:10.516439541 +0100 -@@ -73,6 +73,7 @@ +--- 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 +@@ -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> #include <linux/netfilter_ipv4/ip_conntrack_rtsp.h> @@ -691,7 +691,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h /* per expectation: application helper private data */ union ip_conntrack_expect_help { -@@ -83,6 +84,7 @@ +@@ -83,6 +84,7 @@ union ip_conntrack_expect_help { struct ip_ct_pptp_expect exp_pptp_info; struct ip_ct_h225_expect exp_h225_info; struct ip_ct_rtsp_expect exp_rtsp_info; @@ -699,7 +699,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h #ifdef CONFIG_IP_NF_NAT_NEEDED union { -@@ -99,6 +101,7 @@ +@@ -99,6 +101,7 @@ union ip_conntrack_help { struct ip_ct_pptp_master ct_pptp_info; struct ip_ct_h225_master ct_h225_info; struct ip_ct_rtsp_master ct_rtsp_info; @@ -709,8 +709,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h #ifdef CONFIG_IP_NF_NAT_NEEDED Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_mms.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_mms.h 2007-12-15 05:20:10.516439541 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack_mms.h @@ -0,0 +1,31 @@ +#ifndef _IP_CONNTRACK_MMS_H +#define _IP_CONNTRACK_MMS_H diff --git a/target/linux/generic-2.4/patches/616-netfilter_imq.patch b/target/linux/generic-2.4/patches/616-netfilter_imq.patch index 4df115017c..e0cf1b9bda 100644 --- a/target/linux/generic-2.4/patches/616-netfilter_imq.patch +++ b/target/linux/generic-2.4/patches/616-netfilter_imq.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help =================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:20:09.632389161 +0100 -+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:10.792455269 +0100 -@@ -3160,6 +3160,22 @@ +--- linux-2.4.35.4.orig/Documentation/Configure.help ++++ linux-2.4.35.4/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'. @@ -25,7 +25,7 @@ Index: linux-2.4.35.4/Documentation/Configure.help MARK target support CONFIG_IP_NF_TARGET_MARK This option adds a `MARK' target, which allows you to create rules -@@ -9919,6 +9935,20 @@ +@@ -9919,6 +9935,20 @@ CONFIG_BONDING say M here and read <file:Documentation/modules.txt>. The module will be called bonding.o. @@ -48,9 +48,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help 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 2007-12-15 05:19:54.067502171 +0100 -+++ linux-2.4.35.4/drivers/net/Config.in 2007-12-15 05:20:10.796455498 +0100 -@@ -7,6 +7,11 @@ +--- linux-2.4.35.4.orig/drivers/net/Config.in ++++ linux-2.4.35.4/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 'EQL (serial line load balancing) support' CONFIG_EQUALIZER @@ -64,9 +64,9 @@ Index: linux-2.4.35.4/drivers/net/Config.in if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then Index: linux-2.4.35.4/drivers/net/Makefile =================================================================== ---- linux-2.4.35.4.orig/drivers/net/Makefile 2007-12-15 05:19:51.931380439 +0100 -+++ linux-2.4.35.4/drivers/net/Makefile 2007-12-15 05:20:10.804455954 +0100 -@@ -176,6 +176,7 @@ +--- linux-2.4.35.4.orig/drivers/net/Makefile ++++ linux-2.4.35.4/drivers/net/Makefile +@@ -176,6 +176,7 @@ endif obj-$(CONFIG_STRIP) += strip.o obj-$(CONFIG_DUMMY) += dummy.o @@ -76,8 +76,8 @@ Index: linux-2.4.35.4/drivers/net/Makefile obj-$(CONFIG_AT1500) += lance.o Index: linux-2.4.35.4/drivers/net/imq.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/drivers/net/imq.c 2007-12-15 05:20:10.808456180 +0100 +--- /dev/null ++++ linux-2.4.35.4/drivers/net/imq.c @@ -0,0 +1,321 @@ +/* + * Pseudo-driver for the intermediate queue device. @@ -402,8 +402,8 @@ Index: linux-2.4.35.4/drivers/net/imq.c +MODULE_LICENSE("GPL"); Index: linux-2.4.35.4/include/linux/imq.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/imq.h 2007-12-15 05:20:10.808456180 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/imq.h @@ -0,0 +1,9 @@ +#ifndef _IMQ_H +#define _IMQ_H @@ -416,8 +416,8 @@ Index: linux-2.4.35.4/include/linux/imq.h +#endif /* _IMQ_H */ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h 2007-12-15 05:20:10.808456180 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h @@ -0,0 +1,8 @@ +#ifndef _IPT_IMQ_H +#define _IPT_IMQ_H @@ -429,8 +429,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_IMQ.h +#endif /* _IPT_IMQ_H */ Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_IMQ.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_IMQ.h 2007-12-15 05:20:10.808456180 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_IMQ.h @@ -0,0 +1,8 @@ +#ifndef _IP6T_IMQ_H +#define _IP6T_IMQ_H @@ -442,9 +442,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv6/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 2007-12-15 05:20:05.060128604 +0100 -+++ linux-2.4.35.4/include/linux/skbuff.h 2007-12-15 05:20:10.808456180 +0100 -@@ -93,6 +93,9 @@ +--- linux-2.4.35.4.orig/include/linux/skbuff.h ++++ linux-2.4.35.4/include/linux/skbuff.h +@@ -93,6 +93,9 @@ struct nf_ct_info { struct nf_conntrack *master; }; #endif @@ -454,7 +454,7 @@ Index: linux-2.4.35.4/include/linux/skbuff.h struct sk_buff_head { /* These two members must be first. */ -@@ -182,7 +185,7 @@ +@@ -182,7 +185,7 @@ struct sk_buff { unsigned int len; /* Length of actual data */ unsigned int data_len; unsigned int csum; /* Checksum */ @@ -463,7 +463,7 @@ Index: linux-2.4.35.4/include/linux/skbuff.h cloned, /* head may be cloned (check refcnt to be sure). */ pkt_type, /* Packet class */ ip_summed; /* Driver fed us an IP checksum */ -@@ -219,6 +222,9 @@ +@@ -219,6 +222,9 @@ struct sk_buff { #ifdef CONFIG_NET_SCHED __u32 tc_index; /* traffic control index */ #endif @@ -475,9 +475,9 @@ Index: linux-2.4.35.4/include/linux/skbuff.h #ifdef __KERNEL__ Index: linux-2.4.35.4/net/core/skbuff.c =================================================================== ---- linux-2.4.35.4.orig/net/core/skbuff.c 2007-12-15 05:19:37.174539496 +0100 -+++ linux-2.4.35.4/net/core/skbuff.c 2007-12-15 05:20:10.812456409 +0100 -@@ -202,6 +202,10 @@ +--- linux-2.4.35.4.orig/net/core/skbuff.c ++++ linux-2.4.35.4/net/core/skbuff.c +@@ -202,6 +202,10 @@ struct sk_buff *alloc_skb(unsigned int s /* Set up other state */ skb->len = 0; skb->cloned = 0; @@ -488,7 +488,7 @@ Index: linux-2.4.35.4/net/core/skbuff.c skb->data_len = 0; atomic_set(&skb->users, 1); -@@ -250,6 +254,10 @@ +@@ -250,6 +254,10 @@ static inline void skb_headerinit(void * #ifdef CONFIG_NET_SCHED skb->tc_index = 0; #endif @@ -499,7 +499,7 @@ Index: linux-2.4.35.4/net/core/skbuff.c } static void skb_drop_fraglist(struct sk_buff *skb) -@@ -400,6 +408,10 @@ +@@ -400,6 +408,10 @@ struct sk_buff *skb_clone(struct sk_buff #ifdef CONFIG_NET_SCHED C(tc_index); #endif @@ -510,7 +510,7 @@ Index: linux-2.4.35.4/net/core/skbuff.c atomic_inc(&(skb_shinfo(skb)->dataref)); skb->cloned = 1; -@@ -444,6 +456,10 @@ +@@ -444,6 +456,10 @@ static void copy_skb_header(struct sk_bu #ifdef CONFIG_NET_SCHED new->tc_index = old->tc_index; #endif @@ -523,9 +523,9 @@ Index: linux-2.4.35.4/net/core/skbuff.c /** Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:10.504438857 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:10.812456409 +0100 -@@ -171,6 +171,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in ++++ linux-2.4.35.4/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 @@ -535,9 +535,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in 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 2007-12-15 05:20:10.508439083 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:10.812456409 +0100 -@@ -138,6 +138,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile ++++ linux-2.4.35.4/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_MARK) += ipt_MARK.o @@ -547,8 +547,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_IMQ.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_IMQ.c 2007-12-15 05:20:10.812456409 +0100 +--- /dev/null ++++ linux-2.4.35.4/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> @@ -630,9 +630,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_IMQ.c +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 2007-12-15 05:20:09.300370243 +0100 -+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in 2007-12-15 05:20:10.816456638 +0100 -@@ -72,6 +72,7 @@ +--- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in ++++ linux-2.4.35.4/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 dep_tristate ' MARK target support' CONFIG_IP6_NF_TARGET_MARK $CONFIG_IP6_NF_MANGLE @@ -642,9 +642,9 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in fi Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile =================================================================== ---- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile 2007-12-15 05:20:09.304370470 +0100 -+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile 2007-12-15 05:20:10.816456638 +0100 -@@ -29,6 +29,7 @@ +--- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile ++++ linux-2.4.35.4/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_TARGET_MARK) += ip6t_MARK.o @@ -654,8 +654,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_IMQ.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_IMQ.c 2007-12-15 05:20:10.816456638 +0100 +--- /dev/null ++++ linux-2.4.35.4/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> @@ -737,8 +737,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_IMQ.c +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 2007-12-15 05:19:37.226542457 +0100 -+++ linux-2.4.35.4/net/sched/sch_generic.c 2007-12-15 05:20:10.816456638 +0100 +--- linux-2.4.35.4.orig/net/sched/sch_generic.c ++++ linux-2.4.35.4/net/sched/sch_generic.c @@ -29,6 +29,9 @@ #include <linux/skbuff.h> #include <linux/rtnetlink.h> @@ -749,7 +749,7 @@ Index: linux-2.4.35.4/net/sched/sch_generic.c #include <linux/list.h> #include <net/sock.h> #include <net/pkt_sched.h> -@@ -90,7 +93,11 @@ +@@ -90,7 +93,11 @@ int qdisc_restart(struct net_device *dev spin_unlock(&dev->queue_lock); if (!netif_queue_stopped(dev)) { diff --git a/target/linux/generic-2.4/patches/617-netfilter_time.patch b/target/linux/generic-2.4/patches/617-netfilter_time.patch index 1167e2b824..8eb111a4e9 100644 --- a/target/linux/generic-2.4/patches/617-netfilter_time.patch +++ b/target/linux/generic-2.4/patches/617-netfilter_time.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in 2007-12-15 05:20:10.812456409 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:11.208478976 +0100 -@@ -47,6 +47,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in ++++ linux-2.4.35.4/net/ipv4/netfilter/Config.in +@@ -47,6 +47,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 ' TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES @@ -12,8 +12,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in dep_tristate ' ECN match support' CONFIG_IP_NF_MATCH_ECN $CONFIG_IP_NF_IPTABLES Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_time.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_time.c 2007-12-15 05:20:11.212479205 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_time.c @@ -0,0 +1,193 @@ +/* + This is a module which is used for time matching @@ -210,9 +210,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_time.c +} Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:10.812456409 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:11.216479434 +0100 -@@ -111,6 +111,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile ++++ linux-2.4.35.4/net/ipv4/netfilter/Makefile +@@ -111,6 +111,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_TOS) += ipt_tos.o @@ -222,8 +222,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_time.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_time.h 2007-12-15 05:20:11.216479434 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_time.h @@ -0,0 +1,15 @@ +#ifndef __ipt_time_h_included__ +#define __ipt_time_h_included__ diff --git a/target/linux/generic-2.4/patches/618-netfilter_multiport_backport.patch b/target/linux/generic-2.4/patches/618-netfilter_multiport_backport.patch index 68f9dab004..38ac94a562 100644 --- a/target/linux/generic-2.4/patches/618-netfilter_multiport_backport.patch +++ b/target/linux/generic-2.4/patches/618-netfilter_multiport_backport.patch @@ -1,8 +1,8 @@ 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 2007-12-15 05:19:37.022530833 +0100 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_multiport.h 2007-12-15 05:20:11.456493111 +0100 -@@ -11,11 +11,12 @@ +--- 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 +@@ -11,11 +11,12 @@ enum ipt_multiport_flags #define IPT_MULTI_PORTS 15 @@ -19,8 +19,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_multiport.h #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 2007-12-15 05:19:37.030531288 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_multiport.c 2007-12-15 05:20:11.464493568 +0100 +--- linux-2.4.35.4.orig/net/ipv4/netfilter/ipt_multiport.c ++++ linux-2.4.35.4/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. */ diff --git a/target/linux/generic-2.4/patches/619-netfilter_classify.patch b/target/linux/generic-2.4/patches/619-netfilter_classify.patch index e4bceb95b7..084c85cf8d 100644 --- a/target/linux/generic-2.4/patches/619-netfilter_classify.patch +++ b/target/linux/generic-2.4/patches/619-netfilter_classify.patch @@ -1,7 +1,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CLASSIFY.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CLASSIFY.h 2007-12-15 05:20:11.684506105 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_CLASSIFY.h @@ -0,0 +1,8 @@ +#ifndef _IPT_CLASSIFY_H +#define _IPT_CLASSIFY_H @@ -13,9 +13,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/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 2007-12-15 05:20:11.208478976 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:11.688506331 +0100 -@@ -172,6 +172,7 @@ +--- 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" ]; 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 @@ -25,8 +25,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in if [ "$CONFIG_IP_NF_CONNTRACK_MARK" != "n" ]; then Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c 2007-12-15 05:20:11.696506789 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c @@ -0,0 +1,82 @@ +/* + * This is a module which is used for setting the skb->priority field @@ -112,9 +112,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_CLASSIFY.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:11.216479434 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:11.696506789 +0100 -@@ -134,6 +134,7 @@ +--- 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_ # targets obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o diff --git a/target/linux/generic-2.4/patches/620-netfilter_iprange.patch b/target/linux/generic-2.4/patches/620-netfilter_iprange.patch index 897226f66b..ed1927fb51 100644 --- a/target/linux/generic-2.4/patches/620-netfilter_iprange.patch +++ b/target/linux/generic-2.4/patches/620-netfilter_iprange.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help =================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:20:10.792455269 +0100 -+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:11.948521148 +0100 -@@ -2986,6 +2986,14 @@ +--- linux-2.4.35.4.orig/Documentation/Configure.help ++++ linux-2.4.35.4/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'. @@ -19,8 +19,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help 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 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_iprange.h 2007-12-15 05:20:11.952521377 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_iprange.h @@ -0,0 +1,23 @@ +#ifndef _IPT_IPRANGE_H +#define _IPT_IPRANGE_H @@ -47,9 +47,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/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 2007-12-15 05:20:11.688506331 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:11.960521836 +0100 -@@ -27,6 +27,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in ++++ linux-2.4.35.4/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 ' limit match support' CONFIG_IP_NF_MATCH_LIMIT $CONFIG_IP_NF_IPTABLES @@ -59,8 +59,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in 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 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_iprange.c 2007-12-15 05:20:11.964522063 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_iprange.c @@ -0,0 +1,101 @@ +/* + * iptables module to match IP address ranges @@ -165,9 +165,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_iprange.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:11.696506789 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:11.976522746 +0100 -@@ -90,6 +90,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile ++++ linux-2.4.35.4/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 obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o diff --git a/target/linux/generic-2.4/patches/621-netfilter_random.patch b/target/linux/generic-2.4/patches/621-netfilter_random.patch index 70c528e8e2..506516eb2d 100644 --- a/target/linux/generic-2.4/patches/621-netfilter_random.patch +++ b/target/linux/generic-2.4/patches/621-netfilter_random.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help =================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:20:11.948521148 +0100 -+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:12.260538930 +0100 -@@ -2914,6 +2914,15 @@ +--- linux-2.4.35.4.orig/Documentation/Configure.help ++++ linux-2.4.35.4/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'. @@ -18,7 +18,7 @@ Index: linux-2.4.35.4/Documentation/Configure.help Netfilter MARK match support CONFIG_IP_NF_MATCH_MARK Netfilter mark matching allows you to match packets based on the -@@ -3229,6 +3238,7 @@ +@@ -3229,6 +3238,7 @@ CONFIG_IP_NF_MATCH_HELPER If you want to compile it as a module, say M here and read Documentation/modules.txt. If unsure, say `Y'. @@ -26,7 +26,7 @@ Index: linux-2.4.35.4/Documentation/Configure.help TCPMSS match support CONFIG_IP_NF_MATCH_TCPMSS This option adds a `tcpmss' match, which allows you to examine the -@@ -3376,6 +3386,14 @@ +@@ -3376,6 +3386,14 @@ CONFIG_IP6_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'. @@ -43,8 +43,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help 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 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h 2007-12-15 05:20:12.264539159 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h @@ -0,0 +1,11 @@ +#ifndef _IPT_RAND_H +#define _IPT_RAND_H @@ -59,8 +59,8 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_random.h +#endif /*_IPT_RAND_H*/ Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h 2007-12-15 05:20:12.272539617 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.h @@ -0,0 +1,11 @@ +#ifndef _IP6T_RAND_H +#define _IP6T_RAND_H @@ -75,9 +75,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv6/ip6t_random.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 2007-12-15 05:20:11.960521836 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in 2007-12-15 05:20:12.276539844 +0100 -@@ -48,6 +48,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in ++++ linux-2.4.35.4/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 ' TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES @@ -87,8 +87,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in dep_tristate ' recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c 2007-12-15 05:20:12.276539844 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c @@ -0,0 +1,96 @@ +/* + This is a module which is used for a "random" match support. @@ -188,9 +188,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_random.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile 2007-12-15 05:20:11.976522746 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile 2007-12-15 05:20:12.276539844 +0100 -@@ -115,6 +115,8 @@ +--- 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 obj-$(CONFIG_IP_NF_MATCH_CONDITION) += ipt_condition.o @@ -201,9 +201,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile 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 2007-12-15 05:20:10.816456638 +0100 -+++ linux-2.4.35.4/net/ipv6/netfilter/Config.in 2007-12-15 05:20:12.276539844 +0100 -@@ -19,6 +19,7 @@ +--- linux-2.4.35.4.orig/net/ipv6/netfilter/Config.in ++++ linux-2.4.35.4/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 dep_tristate ' MAC address match support' CONFIG_IP6_NF_MATCH_MAC $CONFIG_IP6_NF_IPTABLES @@ -213,8 +213,8 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/Config.in fi Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c 2007-12-15 05:20:12.276539844 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c @@ -0,0 +1,97 @@ +/* + This is a module which is used for a "random" match support. @@ -315,9 +315,9 @@ Index: linux-2.4.35.4/net/ipv6/netfilter/ip6t_random.c +module_exit(fini); Index: linux-2.4.35.4/net/ipv6/netfilter/Makefile =================================================================== ---- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile 2007-12-15 05:20:10.816456638 +0100 -+++ linux-2.4.35.4/net/ipv6/netfilter/Makefile 2007-12-15 05:20:12.280540069 +0100 -@@ -32,6 +32,7 @@ +--- linux-2.4.35.4.orig/net/ipv6/netfilter/Makefile ++++ linux-2.4.35.4/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 obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o diff --git a/target/linux/generic-2.4/patches/621-tc_esfq.patch b/target/linux/generic-2.4/patches/621-tc_esfq.patch index 86935a82b4..2a05f03456 100644 --- a/target/linux/generic-2.4/patches/621-tc_esfq.patch +++ b/target/linux/generic-2.4/patches/621-tc_esfq.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/Documentation/Configure.help =================================================================== ---- linux-2.4.35.4.orig/Documentation/Configure.help 2007-12-15 05:20:12.260538930 +0100 -+++ linux-2.4.35.4/Documentation/Configure.help 2007-12-15 05:20:12.604558535 +0100 -@@ -11153,6 +11153,24 @@ +--- linux-2.4.35.4.orig/Documentation/Configure.help ++++ linux-2.4.35.4/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>. @@ -29,9 +29,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help 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 2007-12-15 05:19:36.750515331 +0100 -+++ linux-2.4.35.4/include/linux/pkt_sched.h 2007-12-15 05:20:12.608558764 +0100 -@@ -173,8 +173,36 @@ +--- linux-2.4.35.4.orig/include/linux/pkt_sched.h ++++ linux-2.4.35.4/include/linux/pkt_sched.h +@@ -173,8 +173,36 @@ struct tc_sfq_qopt * * The only reason for this is efficiency, it is possible * to change these parameters in compile time. @@ -70,9 +70,9 @@ Index: linux-2.4.35.4/include/linux/pkt_sched.h enum Index: linux-2.4.35.4/net/sched/Config.in =================================================================== ---- linux-2.4.35.4.orig/net/sched/Config.in 2007-12-15 05:19:36.758515786 +0100 -+++ linux-2.4.35.4/net/sched/Config.in 2007-12-15 05:20:12.608558764 +0100 -@@ -12,6 +12,7 @@ +--- linux-2.4.35.4.orig/net/sched/Config.in ++++ linux-2.4.35.4/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 ' SFQ queue' CONFIG_NET_SCH_SFQ @@ -82,9 +82,9 @@ Index: linux-2.4.35.4/net/sched/Config.in 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 2007-12-15 05:19:36.766516242 +0100 -+++ linux-2.4.35.4/net/sched/Makefile 2007-12-15 05:20:12.608558764 +0100 -@@ -19,6 +19,7 @@ +--- linux-2.4.35.4.orig/net/sched/Makefile ++++ linux-2.4.35.4/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_SFQ) += sch_sfq.o @@ -94,8 +94,8 @@ Index: linux-2.4.35.4/net/sched/Makefile obj-$(CONFIG_NET_SCH_PRIO) += sch_prio.o Index: linux-2.4.35.4/net/sched/sch_esfq.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/net/sched/sch_esfq.c 2007-12-15 05:20:12.608558764 +0100 +--- /dev/null ++++ linux-2.4.35.4/net/sched/sch_esfq.c @@ -0,0 +1,649 @@ +/* + * net/sched/sch_esfq.c Extended Stochastic Fairness Queueing discipline. diff --git a/target/linux/generic-2.4/patches/622-netfilter_ipset_porthash.patch b/target/linux/generic-2.4/patches/622-netfilter_ipset_porthash.patch index b0cba8f264..0fc1ec6219 100644 --- a/target/linux/generic-2.4/patches/622-netfilter_ipset_porthash.patch +++ b/target/linux/generic-2.4/patches/622-netfilter_ipset_porthash.patch @@ -1,7 +1,7 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h 2007-12-15 05:20:12.884574492 +0100 +--- /dev/null ++++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_set_ipporthash.h @@ -0,0 +1,34 @@ +#ifndef __IP_SET_IPPORTHASH_H +#define __IP_SET_IPPORTHASH_H diff --git a/target/linux/generic-2.4/patches/700-multiple_default_gateways.patch b/target/linux/generic-2.4/patches/700-multiple_default_gateways.patch index 7b4e48f720..7d5895e6f0 100644 --- a/target/linux/generic-2.4/patches/700-multiple_default_gateways.patch +++ b/target/linux/generic-2.4/patches/700-multiple_default_gateways.patch @@ -1,8 +1,8 @@ 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 2007-12-15 05:19:36.574505299 +0100 -+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat.h 2007-12-15 05:20:13.092586349 +0100 -@@ -121,5 +121,13 @@ +--- 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 +@@ -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, u_int16_t oldcheck); @@ -18,9 +18,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_nat.h #endif Index: linux-2.4.35.4/include/linux/rtnetlink.h =================================================================== ---- linux-2.4.35.4.orig/include/linux/rtnetlink.h 2007-12-15 05:19:36.582505757 +0100 -+++ linux-2.4.35.4/include/linux/rtnetlink.h 2007-12-15 05:20:13.092586349 +0100 -@@ -234,6 +234,8 @@ +--- linux-2.4.35.4.orig/include/linux/rtnetlink.h ++++ linux-2.4.35.4/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 */ #define RTNH_F_ONLINK 4 /* Gateway is forced on link */ @@ -31,9 +31,9 @@ Index: linux-2.4.35.4/include/linux/rtnetlink.h Index: linux-2.4.35.4/include/net/ip_fib.h =================================================================== ---- linux-2.4.35.4.orig/include/net/ip_fib.h 2007-12-15 05:19:36.590506213 +0100 -+++ linux-2.4.35.4/include/net/ip_fib.h 2007-12-15 05:20:13.100586801 +0100 -@@ -162,7 +162,8 @@ +--- linux-2.4.35.4.orig/include/net/ip_fib.h ++++ linux-2.4.35.4/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) { @@ -43,7 +43,7 @@ Index: linux-2.4.35.4/include/net/ip_fib.h main_table->tb_select_default(main_table, key, res); } -@@ -174,6 +175,7 @@ +@@ -174,6 +175,7 @@ extern struct fib_table * fib_tables[RT_ extern int fib_lookup(const struct rt_key *key, struct fib_result *res); extern struct fib_table *__fib_new_table(int id); extern void fib_rule_put(struct fib_rule *r); @@ -51,7 +51,7 @@ Index: linux-2.4.35.4/include/net/ip_fib.h static inline struct fib_table *fib_get_table(int id) { -@@ -275,5 +277,6 @@ +@@ -275,5 +277,6 @@ static inline void fib_res_put(struct fi #endif } @@ -60,9 +60,9 @@ Index: linux-2.4.35.4/include/net/ip_fib.h #endif /* _NET_FIB_H */ Index: linux-2.4.35.4/include/net/route.h =================================================================== ---- linux-2.4.35.4.orig/include/net/route.h 2007-12-15 05:19:36.598506668 +0100 -+++ linux-2.4.35.4/include/net/route.h 2007-12-15 05:20:13.104587030 +0100 -@@ -49,6 +49,8 @@ +--- linux-2.4.35.4.orig/include/net/route.h ++++ linux-2.4.35.4/include/net/route.h +@@ -49,6 +49,8 @@ struct rt_key { __u32 dst; __u32 src; @@ -71,7 +71,7 @@ Index: linux-2.4.35.4/include/net/route.h int iif; int oif; #ifdef CONFIG_IP_ROUTE_FWMARK -@@ -128,6 +130,7 @@ +@@ -128,6 +130,7 @@ extern void ip_rt_advice(struct rtable extern void rt_cache_flush(int how); extern int ip_route_output_key(struct rtable **, const struct rt_key *key); extern int ip_route_input(struct sk_buff*, u32 dst, u32 src, u8 tos, struct net_device *devin); @@ -79,7 +79,7 @@ Index: linux-2.4.35.4/include/net/route.h extern unsigned short ip_rt_frag_needed(struct iphdr *iph, unsigned short new_mtu); extern void ip_rt_update_pmtu(struct dst_entry *dst, unsigned mtu); extern void ip_rt_send_redirect(struct sk_buff *skb); -@@ -148,6 +151,15 @@ +@@ -148,6 +151,15 @@ static inline int ip_route_output(struct } @@ -97,8 +97,8 @@ Index: linux-2.4.35.4/include/net/route.h if (rt) Index: linux-2.4.35.4/net/ipv4/fib_frontend.c =================================================================== ---- linux-2.4.35.4.orig/net/ipv4/fib_frontend.c 2007-12-15 05:19:36.606507123 +0100 -+++ linux-2.4.35.4/net/ipv4/fib_frontend.c 2007-12-15 05:20:13.108587259 +0100 +--- linux-2.4.35.4.orig/net/ipv4/fib_frontend.c ++++ linux-2.4.35.4/net/ipv4/fib_frontend.c @@ -54,6 +54,8 @@ struct fib_table *local_table; struct fib_table *main_table; @@ -108,7 +108,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_frontend.c #else #define RT_TABLE_MIN 1 -@@ -71,6 +73,7 @@ +@@ -71,6 +73,7 @@ struct fib_table *__fib_new_table(int id return tb; } @@ -116,7 +116,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_frontend.c #endif /* CONFIG_IP_MULTIPLE_TABLES */ -@@ -209,6 +212,9 @@ +@@ -209,6 +212,9 @@ int fib_validate_source(u32 src, u32 dst struct in_device *in_dev; struct rt_key key; struct fib_result res; @@ -126,7 +126,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_frontend.c int no_addr, rpf; int ret; -@@ -216,6 +222,7 @@ +@@ -216,6 +222,7 @@ int fib_validate_source(u32 src, u32 dst key.src = dst; key.tos = tos; key.oif = 0; @@ -134,7 +134,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_frontend.c key.iif = oif; key.scope = RT_SCOPE_UNIVERSE; -@@ -237,31 +244,35 @@ +@@ -237,31 +244,35 @@ int fib_validate_source(u32 src, u32 dst goto e_inval_res; *spec_dst = FIB_RES_PREFSRC(res); fib_combine_itag(itag, &res); @@ -177,7 +177,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_frontend.c return ret; last_resort: -@@ -579,9 +590,7 @@ +@@ -579,9 +590,7 @@ static int fib_inetaddr_event(struct not switch (event) { case NETDEV_UP: fib_add_ifaddr(ifa); @@ -187,7 +187,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_frontend.c rt_cache_flush(-1); break; case NETDEV_DOWN: -@@ -617,9 +626,7 @@ +@@ -617,9 +626,7 @@ static int fib_netdev_event(struct notif for_ifa(in_dev) { fib_add_ifaddr(ifa); } endfor_ifa(in_dev); @@ -199,9 +199,9 @@ Index: linux-2.4.35.4/net/ipv4/fib_frontend.c 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 2007-12-15 05:19:36.614507579 +0100 -+++ linux-2.4.35.4/net/ipv4/fib_hash.c 2007-12-15 05:20:13.108587259 +0100 -@@ -71,6 +71,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/fib_hash.c ++++ linux-2.4.35.4/net/ipv4/fib_hash.c +@@ -71,6 +71,7 @@ struct fib_node struct fib_info *fn_info; #define FIB_INFO(f) ((f)->fn_info) fn_key_t fn_key; @@ -209,7 +209,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_hash.c u8 fn_tos; u8 fn_type; u8 fn_scope; -@@ -336,72 +337,123 @@ +@@ -336,72 +337,123 @@ out: return err; } @@ -364,7 +364,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_hash.c goto out; } fi = next_fi; -@@ -409,16 +461,25 @@ +@@ -409,16 +461,25 @@ fn_hash_select_default(struct fib_table } if (order<=0 || fi==NULL) { @@ -393,7 +393,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_hash.c goto out; } -@@ -428,8 +489,11 @@ +@@ -428,8 +489,11 @@ fn_hash_select_default(struct fib_table res->fi = last_resort; if (last_resort) atomic_inc(&last_resort->fib_clntref); @@ -406,7 +406,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_hash.c out: read_unlock(&fib_hash_lock); } -@@ -589,6 +653,7 @@ +@@ -589,6 +653,7 @@ replace: memset(new_f, 0, sizeof(struct fib_node)); @@ -416,9 +416,9 @@ Index: linux-2.4.35.4/net/ipv4/fib_hash.c 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 2007-12-15 05:19:36.618507808 +0100 -+++ linux-2.4.35.4/net/ipv4/fib_rules.c 2007-12-15 05:20:13.108587259 +0100 -@@ -307,6 +307,11 @@ +--- linux-2.4.35.4.orig/net/ipv4/fib_rules.c ++++ linux-2.4.35.4/net/ipv4/fib_rules.c +@@ -307,6 +307,11 @@ static void fib_rules_attach(struct net_ } } @@ -430,7 +430,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_rules.c int fib_lookup(const struct rt_key *key, struct fib_result *res) { int err; -@@ -371,8 +376,10 @@ +@@ -371,8 +376,10 @@ FRprintk("FAILURE\n"); void fib_select_default(const struct rt_key *key, struct fib_result *res) { @@ -445,8 +445,8 @@ Index: linux-2.4.35.4/net/ipv4/fib_rules.c 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 2007-12-15 05:19:36.626508263 +0100 -+++ linux-2.4.35.4/net/ipv4/fib_semantics.c 2007-12-15 05:20:13.112587489 +0100 +--- linux-2.4.35.4.orig/net/ipv4/fib_semantics.c ++++ linux-2.4.35.4/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; @@ -455,7 +455,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c #define for_fib_info() { struct fib_info *fi; \ for (fi = fib_info_list; fi; fi = fi->fib_next) -@@ -150,7 +151,7 @@ +@@ -150,7 +151,7 @@ static __inline__ int nh_comp(const stru #ifdef CONFIG_NET_CLS_ROUTE nh->nh_tclassid != onh->nh_tclassid || #endif @@ -464,7 +464,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c return -1; onh++; } endfor_nexthops(fi); -@@ -166,7 +167,7 @@ +@@ -166,7 +167,7 @@ static __inline__ struct fib_info * fib_ nfi->fib_prefsrc == fi->fib_prefsrc && nfi->fib_priority == fi->fib_priority && memcmp(nfi->fib_metrics, fi->fib_metrics, sizeof(fi->fib_metrics)) == 0 && @@ -473,7 +473,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c (nfi->fib_nhs == 0 || nh_comp(fi, nfi) == 0)) return fi; } endfor_fib_info(); -@@ -365,8 +366,11 @@ +@@ -365,8 +366,11 @@ static int fib_check_nh(const struct rtm return -EINVAL; if ((dev = __dev_get_by_index(nh->nh_oif)) == NULL) return -ENODEV; @@ -487,7 +487,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c nh->nh_dev = dev; dev_hold(dev); nh->nh_scope = RT_SCOPE_LINK; -@@ -380,23 +384,48 @@ +@@ -380,23 +384,48 @@ static int fib_check_nh(const struct rtm /* It is not necessary, but requires a bit of thinking */ if (key.scope < RT_SCOPE_LINK) key.scope = RT_SCOPE_LINK; @@ -552,7 +552,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c } else { struct in_device *in_dev; -@@ -407,8 +436,11 @@ +@@ -407,8 +436,11 @@ out: if (in_dev == NULL) return -ENODEV; if (!(in_dev->dev->flags&IFF_UP)) { @@ -566,7 +566,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c } nh->nh_dev = in_dev->dev; dev_hold(nh->nh_dev); -@@ -606,8 +638,12 @@ +@@ -606,8 +638,12 @@ fib_semantic_match(int type, struct fib_ for_nexthops(fi) { if (nh->nh_flags&RTNH_F_DEAD) continue; @@ -581,7 +581,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c } #ifdef CONFIG_IP_ROUTE_MULTIPATH if (nhsel < fi->fib_nhs) { -@@ -873,22 +909,35 @@ +@@ -873,22 +909,35 @@ int fib_sync_down(u32 local, struct net_ if (local && fi->fib_prefsrc == local) { fi->fib_flags |= RTNH_F_DEAD; ret++; @@ -626,7 +626,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c } #ifdef CONFIG_IP_ROUTE_MULTIPATH if (force > 1 && nh->nh_dev == dev) { -@@ -906,37 +955,55 @@ +@@ -906,37 +955,55 @@ int fib_sync_down(u32 local, struct net_ return ret; } @@ -690,7 +690,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c } endfor_nexthops(fi) if (alive > 0) { -@@ -944,9 +1011,13 @@ +@@ -944,9 +1011,13 @@ int fib_sync_up(struct net_device *dev) ret++; } } endfor_fib_info(); @@ -704,7 +704,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c /* The algorithm is suboptimal, but it provides really fair weighted route distribution. -@@ -955,24 +1026,45 @@ +@@ -955,24 +1026,45 @@ int fib_sync_up(struct net_device *dev) void fib_select_multipath(const struct rt_key *key, struct fib_result *res) { struct fib_info *fi = res->fi; @@ -758,7 +758,7 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c } -@@ -982,20 +1074,40 @@ +@@ -982,20 +1074,40 @@ void fib_select_multipath(const struct r w = jiffies % fi->fib_power; @@ -804,9 +804,9 @@ Index: linux-2.4.35.4/net/ipv4/fib_semantics.c #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 2007-12-15 05:19:36.634508719 +0100 -+++ linux-2.4.35.4/net/ipv4/ip_nat_dumb.c 2007-12-15 05:20:13.112587489 +0100 -@@ -124,6 +124,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/ip_nat_dumb.c ++++ linux-2.4.35.4/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; key.oif = 0; @@ -816,9 +816,9 @@ Index: linux-2.4.35.4/net/ipv4/ip_nat_dumb.c #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 2007-12-15 05:19:36.642509177 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c 2007-12-15 05:20:13.112587489 +0100 -@@ -41,6 +41,10 @@ +--- 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 +@@ -41,6 +41,10 @@ do_masquerade(struct sk_buff **pskb, con enum ip_conntrack_info ctinfo; struct ip_conntrack *ct; unsigned int ret; @@ -829,7 +829,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c /* Sorry, only ICMP, TCP and UDP. */ if (iph->protocol != IPPROTO_ICMP -@@ -64,22 +68,28 @@ +@@ -64,22 +68,28 @@ do_masquerade(struct sk_buff **pskb, con } info = &ct->nat.info; @@ -862,7 +862,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c ip_rt_put(rt); range = ((struct ip_nat_multi_range) { 1, -@@ -92,11 +102,31 @@ +@@ -92,11 +102,31 @@ do_masquerade(struct sk_buff **pskb, con WRITE_UNLOCK(&ip_nat_lock); return ret; } @@ -897,9 +897,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_fw_compat_masq.c 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 2007-12-15 05:20:06.404205198 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c 2007-12-15 05:20:13.112587489 +0100 -@@ -994,6 +994,60 @@ +--- 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 +@@ -994,6 +994,60 @@ icmp_reply_translation(struct sk_buff *s return NF_ACCEPT; } @@ -962,9 +962,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_core.c 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 2007-12-15 05:19:36.654509858 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c 2007-12-15 05:20:13.112587489 +0100 -@@ -245,6 +245,9 @@ +--- 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 +@@ -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 = { { NULL, NULL }, ip_nat_in, PF_INET, NF_IP_PRE_ROUTING, NF_IP_PRI_NAT_DST }; @@ -974,7 +974,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c /* After packet filtering, change source */ static struct nf_hook_ops ip_nat_out_ops = { { NULL, NULL }, ip_nat_out, PF_INET, NF_IP_POST_ROUTING, NF_IP_PRI_NAT_SRC}; -@@ -313,10 +316,15 @@ +@@ -313,10 +316,15 @@ static int init_or_cleanup(int init) printk("ip_nat_init: can't register in hook.\n"); goto cleanup_nat; } @@ -991,7 +991,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c } ret = nf_register_hook(&ip_nat_local_out_ops); if (ret < 0) { -@@ -336,6 +344,8 @@ +@@ -336,6 +344,8 @@ static int init_or_cleanup(int init) nf_unregister_hook(&ip_nat_local_out_ops); cleanup_outops: nf_unregister_hook(&ip_nat_out_ops); @@ -1002,9 +1002,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_nat_standalone.c 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 2007-12-15 05:19:36.662510316 +0100 -+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c 2007-12-15 05:20:13.116587715 +0100 -@@ -87,7 +87,8 @@ +--- linux-2.4.35.4.orig/net/ipv4/netfilter/ipt_MASQUERADE.c ++++ linux-2.4.35.4/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 */ key.tos = RT_TOS((*pskb)->nh.iph->tos)|RTO_CONN; @@ -1014,7 +1014,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c #ifdef CONFIG_IP_ROUTE_FWMARK key.fwmark = (*pskb)->nfmark; #endif -@@ -98,13 +99,6 @@ +@@ -98,13 +99,6 @@ masquerade_target(struct sk_buff **pskb, " No route: Rusty's brain broke!\n"); return NF_DROP; } @@ -1030,9 +1030,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_MASQUERADE.c 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 2007-12-15 05:19:36.670510772 +0100 -+++ linux-2.4.35.4/net/ipv4/route.c 2007-12-15 05:20:13.116587715 +0100 -@@ -919,6 +919,7 @@ +--- linux-2.4.35.4.orig/net/ipv4/route.c ++++ linux-2.4.35.4/net/ipv4/route.c +@@ -919,6 +919,7 @@ void ip_rt_redirect(u32 old_gw, u32 dadd /* Gateway is different ... */ rt->rt_gateway = new_gw; @@ -1040,7 +1040,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c /* Redirect received -> path was valid */ dst_confirm(&rth->u.dst); -@@ -1343,6 +1344,7 @@ +@@ -1343,6 +1344,7 @@ static int ip_route_input_mc(struct sk_b rth->key.fwmark = skb->nfmark; #endif rth->key.src = saddr; @@ -1048,7 +1048,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c rth->rt_src = saddr; #ifdef CONFIG_IP_ROUTE_NAT rth->rt_dst_map = daddr; -@@ -1356,6 +1358,7 @@ +@@ -1356,6 +1358,7 @@ static int ip_route_input_mc(struct sk_b rth->u.dst.dev = &loopback_dev; dev_hold(rth->u.dst.dev); rth->key.oif = 0; @@ -1056,7 +1056,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c rth->rt_gateway = daddr; rth->rt_spec_dst= spec_dst; rth->rt_type = RTN_MULTICAST; -@@ -1395,7 +1398,7 @@ +@@ -1395,7 +1398,7 @@ e_inval: */ int ip_route_input_slow(struct sk_buff *skb, u32 daddr, u32 saddr, @@ -1065,7 +1065,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c { struct rt_key key; struct fib_result res; -@@ -1415,16 +1418,17 @@ +@@ -1415,16 +1418,17 @@ int ip_route_input_slow(struct sk_buff * goto out; key.dst = daddr; @@ -1086,7 +1086,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c /* Check for the most weird martians, which can be not detected by fib_lookup. -@@ -1445,6 +1449,12 @@ +@@ -1445,6 +1449,12 @@ int ip_route_input_slow(struct sk_buff * if (BADCLASS(daddr) || ZERONET(daddr) || LOOPBACK(daddr)) goto martian_destination; @@ -1099,7 +1099,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c /* * Now we are ready to route packet. */ -@@ -1454,6 +1464,10 @@ +@@ -1454,6 +1464,10 @@ int ip_route_input_slow(struct sk_buff * goto no_route; } free_res = 1; @@ -1110,7 +1110,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c rt_cache_stat[smp_processor_id()].in_slow_tot++; -@@ -1464,7 +1478,7 @@ +@@ -1464,7 +1478,7 @@ int ip_route_input_slow(struct sk_buff * if (1) { u32 src_map = saddr; @@ -1119,7 +1119,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c src_map = fib_rules_policy(saddr, &res, &flags); if (res.type == RTN_NAT) { -@@ -1503,8 +1517,9 @@ +@@ -1503,8 +1517,9 @@ int ip_route_input_slow(struct sk_buff * if (res.type != RTN_UNICAST) goto martian_destination; @@ -1130,7 +1130,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c fib_select_multipath(&key, &res); #endif out_dev = in_dev_get(FIB_RES_DEV(res)); -@@ -1524,6 +1539,7 @@ +@@ -1524,6 +1539,7 @@ int ip_route_input_slow(struct sk_buff * flags |= RTCF_DIRECTSRC; if (out_dev == in_dev && err && !(flags & (RTCF_NAT | RTCF_MASQ)) && @@ -1138,7 +1138,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c (IN_DEV_SHARED_MEDIA(out_dev) || inet_addr_onlink(out_dev, saddr, FIB_RES_GW(res)))) flags |= RTCF_DOREDIRECT; -@@ -1550,6 +1566,7 @@ +@@ -1550,6 +1566,7 @@ int ip_route_input_slow(struct sk_buff * #endif rth->key.src = saddr; rth->rt_src = saddr; @@ -1146,7 +1146,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c rth->rt_gateway = daddr; #ifdef CONFIG_IP_ROUTE_NAT rth->rt_src_map = key.src; -@@ -1562,6 +1579,7 @@ +@@ -1562,6 +1579,7 @@ int ip_route_input_slow(struct sk_buff * rth->u.dst.dev = out_dev->dev; dev_hold(rth->u.dst.dev); rth->key.oif = 0; @@ -1154,7 +1154,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c rth->rt_spec_dst= spec_dst; rth->u.dst.input = ip_forward; -@@ -1572,7 +1590,8 @@ +@@ -1572,7 +1590,8 @@ int ip_route_input_slow(struct sk_buff * rth->rt_flags = flags; #ifdef CONFIG_NET_FASTROUTE @@ -1164,7 +1164,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c struct net_device *odev = rth->u.dst.dev; if (odev != dev && dev->accept_fastpath && -@@ -1595,6 +1614,8 @@ +@@ -1595,6 +1614,8 @@ out: return err; brd_input: if (skb->protocol != htons(ETH_P_IP)) goto e_inval; @@ -1173,7 +1173,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c if (ZERONET(saddr)) spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK); -@@ -1627,6 +1648,7 @@ +@@ -1627,6 +1648,7 @@ local_input: #endif rth->key.src = saddr; rth->rt_src = saddr; @@ -1181,7 +1181,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c #ifdef CONFIG_IP_ROUTE_NAT rth->rt_dst_map = key.dst; rth->rt_src_map = key.src; -@@ -1639,6 +1661,7 @@ +@@ -1639,6 +1661,7 @@ local_input: rth->u.dst.dev = &loopback_dev; dev_hold(rth->u.dst.dev); rth->key.oif = 0; @@ -1189,7 +1189,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c rth->rt_gateway = daddr; rth->rt_spec_dst= spec_dst; rth->u.dst.input= ip_local_deliver; -@@ -1704,8 +1727,9 @@ +@@ -1704,8 +1727,9 @@ martian_source: goto e_inval; } @@ -1201,7 +1201,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c { struct rtable * rth; unsigned hash; -@@ -1719,6 +1743,7 @@ +@@ -1719,6 +1743,7 @@ int ip_route_input(struct sk_buff *skb, if (rth->key.dst == daddr && rth->key.src == saddr && rth->key.iif == iif && @@ -1209,7 +1209,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c rth->key.oif == 0 && #ifdef CONFIG_IP_ROUTE_FWMARK rth->key.fwmark == skb->nfmark && -@@ -1766,9 +1791,21 @@ +@@ -1766,9 +1791,21 @@ int ip_route_input(struct sk_buff *skb, read_unlock(&inetdev_lock); return -EINVAL; } @@ -1232,7 +1232,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c /* * Major route resolver routine. */ -@@ -1791,6 +1828,7 @@ +@@ -1791,6 +1828,7 @@ int ip_route_output_slow(struct rtable * key.tos = tos & IPTOS_RT_MASK; key.iif = loopback_dev.ifindex; key.oif = oldkey->oif; @@ -1240,7 +1240,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c #ifdef CONFIG_IP_ROUTE_FWMARK key.fwmark = oldkey->fwmark; #endif -@@ -1880,6 +1918,7 @@ +@@ -1880,6 +1918,7 @@ int ip_route_output_slow(struct rtable * dev_out = &loopback_dev; dev_hold(dev_out); key.oif = loopback_dev.ifindex; @@ -1248,7 +1248,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c res.type = RTN_LOCAL; flags |= RTCF_LOCAL; goto make_route; -@@ -1887,7 +1926,7 @@ +@@ -1887,7 +1926,7 @@ int ip_route_output_slow(struct rtable * if (fib_lookup(&key, &res)) { res.fi = NULL; @@ -1257,7 +1257,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c /* Apparently, routing tables are wrong. Assume, that the destination is on link. -@@ -1930,6 +1969,7 @@ +@@ -1930,6 +1969,7 @@ int ip_route_output_slow(struct rtable * dev_out = &loopback_dev; dev_hold(dev_out); key.oif = dev_out->ifindex; @@ -1265,7 +1265,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c if (res.fi) fib_info_put(res.fi); res.fi = NULL; -@@ -1937,13 +1977,12 @@ +@@ -1937,13 +1977,12 @@ int ip_route_output_slow(struct rtable * goto make_route; } @@ -1282,7 +1282,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c if (!key.src) key.src = FIB_RES_PREFSRC(res); -@@ -2001,7 +2040,9 @@ +@@ -2001,7 +2040,9 @@ make_route: rth->key.tos = tos; rth->key.src = oldkey->src; rth->key.iif = 0; @@ -1292,7 +1292,7 @@ Index: linux-2.4.35.4/net/ipv4/route.c #ifdef CONFIG_IP_ROUTE_FWMARK rth->key.fwmark = oldkey->fwmark; #endif -@@ -2080,6 +2121,7 @@ +@@ -2080,6 +2121,7 @@ int ip_route_output_key(struct rtable ** rth->key.src == key->src && rth->key.iif == 0 && rth->key.oif == key->oif && @@ -1302,9 +1302,9 @@ Index: linux-2.4.35.4/net/ipv4/route.c #endif Index: linux-2.4.35.4/net/netsyms.c =================================================================== ---- linux-2.4.35.4.orig/net/netsyms.c 2007-12-15 05:19:36.678511227 +0100 -+++ linux-2.4.35.4/net/netsyms.c 2007-12-15 05:20:13.120587941 +0100 -@@ -260,6 +260,7 @@ +--- linux-2.4.35.4.orig/net/netsyms.c ++++ linux-2.4.35.4/net/netsyms.c +@@ -260,6 +260,7 @@ EXPORT_SYMBOL(inet_register_protosw); EXPORT_SYMBOL(inet_unregister_protosw); EXPORT_SYMBOL(ip_route_output_key); EXPORT_SYMBOL(ip_route_input); diff --git a/target/linux/generic-2.4/patches/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.4/patches/801-usb_serial_endpoint_size.patch index 035d5bdb31..5cc0d844a5 100644 --- a/target/linux/generic-2.4/patches/801-usb_serial_endpoint_size.patch +++ b/target/linux/generic-2.4/patches/801-usb_serial_endpoint_size.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c =================================================================== ---- linux-2.4.35.4.orig/drivers/usb/serial/usbserial.c 2007-12-15 05:19:36.542503478 +0100 -+++ linux-2.4.35.4/drivers/usb/serial/usbserial.c 2007-12-15 05:20:13.496609372 +0100 -@@ -331,6 +331,7 @@ +--- linux-2.4.35.4.orig/drivers/usb/serial/usbserial.c ++++ linux-2.4.35.4/drivers/usb/serial/usbserial.c +@@ -331,6 +331,7 @@ static void generic_shutdown (struct us #ifdef CONFIG_USB_SERIAL_GENERIC static __u16 vendor = 0x05f9; static __u16 product = 0xffff; @@ -10,7 +10,7 @@ Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */ -@@ -1557,7 +1558,11 @@ +@@ -1557,7 +1558,11 @@ static void * usb_serial_probe(struct us err("No free urbs available"); goto probe_error; } @@ -22,7 +22,7 @@ Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c port->bulk_in_endpointAddress = endpoint->bEndpointAddress; port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL); if (!port->bulk_in_buffer) { -@@ -1921,4 +1926,7 @@ +@@ -1921,4 +1926,7 @@ MODULE_PARM_DESC(vendor, "User specified MODULE_PARM(product, "h"); MODULE_PARM_DESC(product, "User specified USB idProduct"); diff --git a/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch b/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch index a1828f8312..ad00693fcc 100644 --- a/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch +++ b/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch @@ -1,8 +1,8 @@ Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c =================================================================== ---- linux-2.4.35.4.orig/drivers/usb/serial/usbserial.c 2007-12-15 05:20:13.496609372 +0100 -+++ linux-2.4.35.4/drivers/usb/serial/usbserial.c 2007-12-15 05:20:13.708621453 +0100 -@@ -333,7 +333,7 @@ +--- linux-2.4.35.4.orig/drivers/usb/serial/usbserial.c ++++ linux-2.4.35.4/drivers/usb/serial/usbserial.c +@@ -333,7 +333,7 @@ static __u16 vendor = 0x05f9; static __u16 product = 0xffff; static int maxSize = 0; @@ -11,7 +11,7 @@ Index: linux-2.4.35.4/drivers/usb/serial/usbserial.c /* All of the device info needed for the Generic Serial Converter */ static struct usb_serial_device_type generic_device = { -@@ -1836,6 +1836,34 @@ +@@ -1836,6 +1836,34 @@ static int __init usb_serial_init(void) generic_device_ids[0].idVendor = vendor; generic_device_ids[0].idProduct = product; generic_device_ids[0].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT; |