Attached are two patches dealing with two issues I think should be addressed in 2.6.13 if possible.
The first patch is the TSO deferral logic fix from Dmitry Yusupov. I think it's correct since even if no new data is tacked on, we will keep the pipe filled to the end since the percentage-of-window test will kick in. The second patch keeps TSO enabled during loss, the idea is to carve out the TSO frames so that they line up to the edges of the SACK blocks. The version I wrote of this a long time ago just chopped things up into MSS sized chunks but that is highly suboptimal. Comments, review, and testing much appreciated. I'd like this to get some exposure before I push it to Linus, especially the second change. Thanks.
diff-tree c40d3d38a8f04fff4394c7323db239bce780db60 (from 30d5b64b63fa69af31b2cba32e6d71d68526eec9) Author: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]> Date: Thu Aug 18 22:09:21 2005 +0200 [PATCH] ide-floppy: fix IDEFLOPPY_TICKS_DELAY * IDEFLOPPY_TICKS_DELAY assumed HZ == 100, fix it * increase the delay to 50ms (to match comment in the code) Thanks to Manfred Scherer <[EMAIL PROTECTED]> for reporting the problem and testing the patch. Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]> diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c @@ -317,7 +317,7 @@ typedef struct ide_floppy_obj { unsigned long flags; } idefloppy_floppy_t; -#define IDEFLOPPY_TICKS_DELAY 3 /* default delay for ZIP 100 */ +#define IDEFLOPPY_TICKS_DELAY HZ/20 /* default delay for ZIP 100 (50ms) */ /* * Floppy flag bits values.
diff-tree 0ac72b351bdf29252e4181b07fa7feed8501b5d2 (from c40d3d38a8f04fff4394c7323db239bce780db60) Author: Juha-Matti Tapio <[EMAIL PROTECTED]> Date: Thu Aug 18 22:13:44 2005 +0200 [PATCH] ide: fix the BLK_DEV_IDEDMA_PCI dependency for drivers/ide/ppc/pmac.c drivers/ide/ppc/pmac.c uses symbols ide_build_sglist, __ide_dma_off_quietly, __ide_dma_on and __ide_dma_timeout when CONFIG_BLK_DEV_IDEDMA_PMAC is defined. The declarations for these symbols (in ide.h) depend on CONFIG_BLK_DEV_IDEDMA_PCI. There is a missing dependency for this in drivers/ide/Kconfig which causes drivers/ide/ppc/pmac.c to fail to build if CONFIG_BLK_DEV_IDEDMA_PMAC is selected but CONFIG_BLK_DEV_IDEDMA_PCI is not. Signed-off-by: Juha-Matti Tapio <[EMAIL PROTECTED]> Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]> diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig @@ -764,6 +764,7 @@ config BLK_DEV_IDE_PMAC_ATA100FIRST config BLK_DEV_IDEDMA_PMAC bool "PowerMac IDE DMA support" depends on BLK_DEV_IDE_PMAC + select BLK_DEV_IDEDMA_PCI help This option allows the driver for the built-in IDE controller on Power Macintoshes and PowerBooks to use DMA (direct memory access)