1. 20 10月, 2007 37 次提交
  2. 19 10月, 2007 3 次提交
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 4fa4d23f
      Linus Torvalds 提交于
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
        pcnet32: remove private net_device_stats structure
        vortex_up should initialize "err"
        pcnet32: remove compile warnings in non-napi mode
        pcnet32: fix non-napi packet reception
        fix EMAC driver for proper napi_synchronize API
        sky2: shutdown cleanup
        napi_synchronize: waiting for NAPI
        forcedeth msi bugfix
        gianfar: fix obviously wrong #ifdef CONFIG_GFAR_NAPI placement
        fs_enet: Update for API changes
        gianfar: remove orphan struct.
        forcedeth: fix rx-work condition in nv_rx_process_optimized() too
      4fa4d23f
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 · a9e82d3a
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: (37 commits)
        ide: set drive->autotune in ide_pci_setup_ports()
        triflex: always tune PIO
        opti621: always tune PIO
        cy82c693: always tune PIO
        cs5520: always tune PIO
        alim15x3: always tune PIO
        ide: add IDE_HFLAG_LEGACY_IRQS host flag
        ide: add IDE_HFLAG_SERIALIZE host flag
        ide: add IDE_HFLAG_ERROR_STOPS_FIFO host flag
        piix: add DECLARE_ICH_DEV() macro
        pdc202xx_old: add DECLARE_PDC2026X_DEV() macro
        pdc202xx_new: add DECLARE_PDCNEW_DEV() macro
        aec62xx: no need to disable UDMA in ->init_hwif method for ATP850UF
        ide: remove .init_setup from ide_pci_device_t
        serverworks: remove ->init_setup
        scc_pata: remove ->init_setup
        pdc202xx_old: remove ->init_setup
        pdc202xx_new: remove ->init_setup
        hpt366: remove ->init_setup
        cmd64x: remove ->init_setup
        ...
      a9e82d3a
    • B
      ide: set drive->autotune in ide_pci_setup_ports() · 85ad93ad
      Bartlomiej Zolnierkiewicz 提交于
      Majority of host drivers using IDE PCI layer set drive->autotune, the only
      exceptions are:
      
      generic.c
      ns87415.c
      rz1000.c
      trm290.c
      * no ->set_pio_mode method
      
      it821x.c:
      * if memory allocation fails drive->autotune won't be set
        (but there also won't be ->set_pio_mode method in such case)
      
      piix.c:
      * MPIIX controller (no ->init_hwif method so also no ->set_pio_mode method)
      
      However if there is no ->set_pio_mode method there are no changes in behavior
      w.r.t. PIO tuning so always set drive->autotune in ide_pci_setup_ports().
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      85ad93ad