1. 15 10月, 2008 20 次提交
  2. 14 10月, 2008 20 次提交
    • R
      qlge: Fix page size ifdef test. · 48501371
      Ron Mercer 提交于
      This ASIC does support all page sizes. For 4k and 8k page size the TX
      control block needs an external scatter gather list.  For page sizes
      larger than 8k the max frags is satisfied by the original TX control
      block.
      Signed-off-by: NRon Mercer <ron.mercer@qlogic.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      48501371
    • A
      net: Rationalise email address: Network Specific Parts · 113aa838
      Alan Cox 提交于
      Clean up the various different email addresses of mine listed in the code
      to a single current and valid address. As Dave says his network merges
      for 2.6.28 are now done this seems a good point to send them in where
      they won't risk disrupting real changes.
      Signed-off-by: NAlan Cox <alan@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      113aa838
    • H
      dsa: fix compile bug on s390 · 510149e3
      Heiko Carstens 提交于
      git commit 45cec1ba
      "dsa: Need to select PHYLIB." causes this build bug on s390:
      
      drivers/built-in.o: In function `phy_stop_interrupts':
      /home/heicarst/linux-2.6/drivers/net/phy/phy.c:631: undefined reference to `free_irq'
      /home/heicarst/linux-2.6/drivers/net/phy/phy.c:646: undefined reference to `enable_irq'
      drivers/built-in.o: In function `phy_start_interrupts':
      /home/heicarst/linux-2.6/drivers/net/phy/phy.c:601: undefined reference to `request_irq'
      drivers/built-in.o: In function `phy_interrupt':
      /home/heicarst/linux-2.6/drivers/net/phy/phy.c:528: undefined reference to `disable_irq_nosync'
      drivers/built-in.o: In function `phy_change':
      /home/heicarst/linux-2.6/drivers/net/phy/phy.c:674: undefined reference to `enable_irq'
      /home/heicarst/linux-2.6/drivers/net/phy/phy.c:692: undefined reference to `disable_irq'
      
      PHYLIB has alread a depend on !S390, however select PHYLIB at DSA overrides
      that unfortunately. So add a depend on !S390 to DSA as well.
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      510149e3
    • A
      netns: mib6 section fixlet · e7dc8494
      Alexey Dobriyan 提交于
        LD      net/ipv6/ipv6.o
      WARNING: net/ipv6/ipv6.o(.text+0xd8): Section mismatch in reference from the function inet6_net_init() to the function .init.text:ipv6_init_mibs()
      Signed-off-by: NAlexey Dobriyan <adobriyan@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e7dc8494
    • R
      enic: Fix Kconfig headline description · eb8a4cb6
      Roland Dreier 提交于
      I don't think the enic driver has anything to do with Mark Everett
      (http://en.wikipedia.org/wiki/A_Man_Called_E).  Fix the Kconfig
      description.
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      eb8a4cb6
    • M
      de2104x: wrong MAC address fix · bc0da3fc
      Martin Langer 提交于
      The de2104x returns sometimes a wrong MAC address. The wrong one is
      like the original one, but it comes with an one byte shift. I found
      this bug on an older alpha ev5 cpu. More details are available in Gentoo
      bugreport #240718.
      
      It seems the hardware is sometimes a little bit too slow for an
      immediate access. This patch solves the problem by introducing a small
      udelay.
      Signed-off-by: NMartin Langer <martin-langer@gmx.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bc0da3fc
    • A
      s390: claw compile fixlet · ebe05d06
      Alexey Dobriyan 提交于
      Signed-off-by: NAlexey Dobriyan <adobriyan@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ebe05d06
    • A
      net: export genphy_restart_aneg · 892871dc
      Adrian Bunk 提交于
      This patch fixes the following build error caused by
      commit ed94493f
      (mv643xx_eth: convert to phylib):
      
      <--  snip  -->
      
      ...
        Building modules, stage 2.
        MODPOST 1280 modules
      ERROR: "genphy_restart_aneg" [drivers/net/mv643xx_eth.ko] undefined!
      ...
      make[2]: *** [__modpost] Error 1
      
      <--  snip  -->
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      892871dc
    • D
      cxgb3: extend copyrights to 2008 · a02d44a0
      Divy Le Ray 提交于
      Update copyright banner to 2008.
      Signed-off-by: NDivy Le Ray <divy@chelsio.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a02d44a0
    • D
      cxgb3: update driver version · fe642ebc
      Divy Le Ray 提交于
      Add a field to the driver versioning info.
      Update version to 1.1.0.
      Signed-off-by: NDivy Le Ray <divy@chelsio.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      fe642ebc
    • R
      net/phy: add missing kernel-doc · 78c36b15
      Randy Dunlap 提交于
      Fix kernel-doc warning, missing description:
      
      Warning(lin2627-g3-kdocfixes//drivers/net/phy/mdio_bus.c:63): No description found for parameter 'd'
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      78c36b15
    • I
      pktgen: fix skb leak in case of failure · b4bb4ac8
      Ilpo Järvinen 提交于
      Seems that skb goes into void unless something magic happened
      in pskb_expand_head in case of failure.
      Signed-off-by: NIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
      Acked-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b4bb4ac8
    • A
      mISDN/dsp_cmx.c: fix size checks · 9e9540b8
      Adrian Bunk 提交于
      The checks for ensuring that the array indices are inside the range
      were flipped.
      Reported-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9e9540b8
    • A
      misdn: use nonseekable_open() · 6bff338b
      Andrew Morton 提交于
      The driver just sets ->llseek to NULL.  It should also clear FMODE_LSEEK to
      tell the VFS that seeks are not supported.
      
      Pointed out by Christoph Hellwig.
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6bff338b
    • K
      net: fix driver build errors due to missing net/ip6_checksum.h include · b7c6bfb7
      Kamalesh Babulal 提交于
        2.6.27-git2 kernel build fails with allyesconfig on powerpc with 
      build error 
      
      <introduced by commit 01f2e4ea> 
      
      CC    drivers/net/enic/enic_main.o
      drivers/net/enic/enic_main.c: In function ‘enic_queue_wq_skb_tso’:
      drivers/net/enic/enic_main.c:576: error: implicit declaration of function ‘csum_ipv6_magic’
      make[3]: *** [drivers/net/enic/enic_main.o] Error 1
      
      <introduced by commit c4e84bde>
      
      drivers/net/qlge/qlge_main.c: In function ‘ql_tso’:
      drivers/net/qlge/qlge_main.c:1862: error: implicit declaration of function ‘csum_ipv6_magic’
      make[3]: *** [drivers/net/qlge/qlge_main.o] Error 1
        
      <introduced by commit 95252236>
      
      drivers/net/jme.c: In function ‘jme_tx_tso’:
      drivers/net/jme.c:1784: error: implicit declaration of function ‘csum_ipv6_magic’
      make[2]: *** [drivers/net/jme.o] Error 1
      Signed-off-by: NKamalesh Babulal <kamalesh@linux.vnet.ibm.com>
      Signed-off-by: NRon Mercer <ron.mercer@qlogic.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b7c6bfb7
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · 7591103c
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (66 commits)
        ata: Add documentation for hard disk shock protection interface (v3)
        ide: Implement disk shock protection support (v4)
        ide-cd: fix printk format warning
        piix: add Hercules EC-900 mini-notebook to ich_laptop short cable list
        ide-atapi: assign taskfile flags per device type
        ide-cd: move cdrom_info.dma to ide_drive_t.dma
        ide: add ide_drive_t.dma flag
        ide-cd: add a debug_mask module parameter
        ide-cd: convert driver to new ide debugging macro (v3)
        ide: move SFF DMA code to ide-dma-sff.c
        ide: cleanup ide-dma.c
        ide: cleanup ide_build_dmatable()
        ide: remove needless includes from ide-dma.c
        ide: switch to DMA-mapping API part #2
        ide: make ide_dma_timeout() available also for CONFIG_BLK_DEV_IDEDMA_SFF=n
        ide: make ide_dma_lost_irq() available also for CONFIG_BLK_DEV_IDEDMA_SFF=n
        ide: __ide_dma_end() -> ide_dma_end()
        pmac: remove needless pmac_ide_destroy_dmatable() wrapper
        pmac: remove superfluous pmif == NULL checks
        ide: Two fixes regarding memory allocation
        ...
      7591103c
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 · 2be4ff2f
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
        pcmcia: ioctl-internal definitions
        pcmcia: cistpl header cleanup
        pcmcia: remove unused argument to pcmcia_parse_tuple()
        pcmcia: card services header cleanup
        pcmcia: device_id header cleanup
        pcmcia: encapsulate ioaddr_t
        pcmcia: cleanup device driver header file
        pcmcia: cleanup socket services header file
        pcmcia: merge ds_internal.h into cs_internal.h
        pcmcia: cleanup cs_internal.h
        pcmcia: cs_internal.h is internal
        pcmcia: use dev_printk for cs_error()
        pcmcia: remove CS_ error codes alltogether
        pcmcia: deprecate CS_BAD_TUPLE
        pcmcia: deprecate CS_BAD_ARGS
        pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE
        pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE
        pcmcia: deprecate CS_NO_MORE_ITEMS
        pcmcia: deprecate CS_IN_USE
        pcmcia: deprecate CS_CONFIGURATION_LOCKED
        ...
      
      Fix trivial conflict in drivers/pcmcia/ds.c manually
      2be4ff2f
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · cf2fa660
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (313 commits)
        V4L/DVB (9186): Added support for Prof 7300 DVB-S/S2 cards
        V4L/DVB (9185): S2API: Ensure we have a reasonable ROLLOFF default
        V4L/DVB (9184): cx24116: Change the default SNR units back to percentage by default.
        V4L/DVB (9183): S2API: Return error of the caller provides 0 commands.
        V4L/DVB (9182): S2API: Added support for DTV_HIERARCHY
        V4L/DVB (9181): S2API: Add support fot DTV_GUARD_INTERVAL and DTV_TRANSMISSION_MODE
        V4L/DVB (9180): S2API: Added support for DTV_CODE_RATE_HP/LP
        V4L/DVB (9179): S2API: frontend.h cleanup
        V4L/DVB (9178): cx24116: Add module parameter to return SNR as ESNO.
        V4L/DVB (9177): S2API: Change _8PSK / _16APSK to PSK_8 and APSK_16
        V4L/DVB (9176): Add support for DvbWorld USB cards with STV0288 demodulator.
        V4L/DVB (9175): Remove NULL pointer in stb6000 driver.
        V4L/DVB (9174): Allow custom inittab for ST STV0288 demodulator.
        V4L/DVB (9173): S2API: Remove the hardcoded command limit during validation
        V4L/DVB (9172): S2API: Bugfix related to DVB-S / DVB-S2 tuning for the legacy API.
        V4L/DVB (9171): S2API: Stop an OOPS if illegal commands are dumped in S2API.
        V4L/DVB (9170): cx24116: Sanity checking to data input via S2API to the cx24116 demod.
        V4L/DVB (9169): uvcvideo: Support two new Bison Electronics webcams.
        V4L/DVB (9168): Add support for MSI TV@nywhere Plus remote
        V4L/DVB: v4l2-dev: remove duplicated #include
        ...
      cf2fa660
    • E
      ata: Add documentation for hard disk shock protection interface (v3) · 9c6102d4
      Elias Oltmanns 提交于
      Put some information (and pointers to more) into the kernel's doc tree,
      describing briefly the interface to the kernel's disk head unloading
      facility. Information about how to set up a complete shock protection
      system under GNU/Linux can be found on the web and is referenced
      accordingly.
      
      v3:
      Here is some final polish including various spelling corrections
      pointed out by Grant Grundler and Peter Moulder. Also, I have added some
      information about the timing constraints related to disk head parking.
      The patch looks more impressive than it really is and I think it would
      be alright just to incorporate it into the original patch so as not to
      clutter up the git log.
      Signed-off-by: NElias Oltmanns <eo@nebensachen.de>
      Cc: Jeff Garzik <jeff@garzik.org>
      Cc: Randy Dunlap <randy.dunlap@oracle.com>
      Cc: Tejun Heo <htejun@gmail.com>
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      9c6102d4
    • E
      ide: Implement disk shock protection support (v4) · 4abdc6ee
      Elias Oltmanns 提交于
      On user request (through sysfs), the IDLE IMMEDIATE command with UNLOAD
      FEATURE as specified in ATA-7 is issued to the device and processing of
      the request queue is stopped thereafter until the specified timeout
      expires or user space asks to resume normal operation. This is supposed
      to prevent the heads of a hard drive from accidentally crashing onto the
      platter when a heavy shock is anticipated (like a falling laptop expected
      to hit the floor). Port resets are deferred whenever a device on that
      port is in the parked state.
      
      v3:
      Elias Oltmanns <eo@nebensachen.de> wrote:
      [...]
      > >> 1. Make sure that no negative value is being passed to
      > >>    jiffies_to_msecs() in ide_park_show().
      > >> 2. Drop the superfluous variable hwif in ide_special_rq().
      > >> 3. Skip initialisation of task and tf in ide_special_rq() if we are not
      > >>    handling a (un)park request.
      > >
      > > Well, #3 should have been done differently because we donn't want to
      > > check for REQ_(UN)?PARK_HEADS more often than is necessary.
      > 
      > While preparing the backport to 2.6.27, it has just occurred to me that
      > we need to clear the IDE_DFLAG_PARKED flag in ide_disk_pre_reset()
      > because this flag must not be set after *any* sort of access to the
      > device.
      
      v4:
      Fix a memory leak due to a missing blk_put_request() in
      issue_park_cmd(). Additionally, we should plug the queue when enqueueing
      the unpark request because there is no guarantee that the park timeout
      has not expired by then. Even though the chance for that to happen is
      very slim, the request might end up hanging in the queue until the next
      I/O operation is queued up. While at it, clean up the code a little:
      - make issue_park_cmd() a function of type void since nobody cares for
        the return value anyway;
      - use blk_start_queueing() instead of __blk_run_queue() since we don't
        have to worry about recursion;
      - remove a superfluous pointer deference in task_no_data_intr().
      Signed-off-by: NElias Oltmanns <eo@nebensachen.de>
      Cc: Jeff Garzik <jeff@garzik.org>,
      Cc: Randy Dunlap <randy.dunlap@oracle.com>
      Cc: Tejun Heo <htejun@gmail.com>
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      4abdc6ee