aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Collapse)AuthorAge
* Merge upstream into 'upstream' branch of netdev-2.6.git.Jeff Garzik2005-08-24
|\ | | | | | | Hand fix merge conflict in drivers/net/tokenring/Kconfig.
| * Merge head 'upstream-fixes' of ↵Linus Torvalds2005-08-23
| |\ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| | * libata: release prep (bump versions, etc.)Jeff Garzik2005-08-23
| | | | | | | | | | | | | | | | | | - bump versions where necessary - remove two duplicated+outdated doc comments - add MODULE_VERSION() to AHCI driver
| * | [PATCH] usbnet oops fixlepton2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | There's a "return the wrong SKB" error in the GL620A cable minidriver (for "usbnet") which can oops. This would not appear when talking Linux-to-Linux, only Linux-to-Windows (for recent Linuxes). Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] s390 __CHECKER__ ifdefsAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | remove the bogus games with explicit ifdefs on __CHECKER__ Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Kconfig fix (non-modular SCSI drivers)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | non-modular scsi drivers depend on built-in scsi Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] typo fix in qdio.cAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | dumb typo: u32 volatile * mistyped as u32 * volatile Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] emac netpoll fixAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | netpoll is void(struct net_device *), not int(struct net_device *) Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] m32r_sio gcc4 fixesAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | extern declaration followed by static in drivers/serial/m32r_sio.c Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] missing include in pcmcia_resource.cAl Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | missing include of asm/irq.h Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Kconfig fix (sparc32 drivers/char dependencies)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | since sparc32 Kconfig includes drivers/char/Kconfig (instead of duplicating its parts) we need several new dependencies there to exclude the stuff broken on sparc32 and not excluded by existing dependencies. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Kconfig fix (emac dependencient)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | emac doesn't build modular; ibm_emac_debug doesn't build at all (missing headers). Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Kconfig fix (VGA console on arm/versatile)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | VGA console doesn't exist (or build) on arm/versatile; dependency fixed. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Kconfig fix (amba on arm/versatile)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | AMBA_PL010 is broken on arm/versatile; marked as such Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Kconfig fix (acornscsi)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | acornscsi had been broken for a long time; marked as such Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Kconfig fix (M32R_PLDSIO dependecies)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | M32R_PLDSIO depends on subarchitecture providing PLD_ESIO0CR and friends. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Kconfig fix (parport_pc on m32r)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | parport_pc shouldn't be picked on m32r (no asm/parport.h, for starters) Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Kconfig fix (airo_cs on m32r)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | airo_cs is broken on m32r; marked as such. [Proper fix would involve separating PCI-dependent parts and making sure they don't get in the way _and_ arranging for asm/scatterlist.h getting picked on m32r] Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Kconfig fix (tms380tr and ISA_DMA_API)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | ISA parts of tms380tr are using ISA DMA helpers and should depend on ISA_DMA_API. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Kconfig fix (arv)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | arv uses constants provided only by include/asm-m32r/m32700ut/m32700ut_lan.h It won't build for any subarchitecture other than M32700UT; marked as such. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Kconfig fix (infiniband and PCI)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | infiniband uses PCI helpers all over the place (including the core parts) and won't build without PCI. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Kconfig fix (PMAC_BACKLIGHT on ppc64)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | PMAC_BACKLIGHT is broken on ppc64; marked as such Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Kconfig fix (HISAX_FRITZPCI on ppc64)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | HISAX_FRITZPCI is broken on ppc64; marked as such Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Kconfig fix (m32r genrtc)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | genrtc is not for m32r; marked as such. Probably ought to put that into arch/* - list of "don't build it on <platform>" is getting too long. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] Kconfig fix (epca on 64bit)Al Viro2005-08-23
| | | | | | | | | | | | | | | | | | | | | epca is broken on 64bit; marked as such Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] zd1201 kmalloc size fixAlexey Dobriyan2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Noticed by Coverity checker. (akpm: I stole this from Greg's tree and used the (IMO) tidier sizeof(*p) construct). Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] md: make sure resync gets started when array starts.NeilBrown2005-08-23
| |/ | | | | | | | | | | | | | | | | | | | | | | | | We weren't actually waking up the md thread after setting MD_RECOVERY_NEEDED when assembling an array, so it is possible to lose a race and not actually start resync. So add a call to md_wakeup_thread, and while we are at it, remove all the "if (mddev->thread)" guards as md_wake_thread does its own checking. Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [TG3]: Update driver version and reldate.David S. Miller2005-08-19
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * [TG3]: Fix SerDes detectionMichael Chan2005-08-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A problem was reported by Grant Grundler on an HP rx8620 using IOX Core LAN partno(A7109-6) 5701 copper NIC. The tg3 driver mistakenly detects this NIC as having a SerDes PHY and link does not come up as a result. The problem was caused by an incorrectly programmed eeprom that set the NIC_SRAM_DATA_CFG_PHY_TYPE_FIBER bit in the NIC_SRAM_DATA_CFG location. This patch will override the NIC_SRAM_DATA_CFG_PHY_TYPE_FIBER bit if a valid PHY ID is read from the MII registers on older 570x chips where the MII interface is not used on SerDes chips. On newer chips such as the 5780 that use MII for both copper and SerDes, SerDes detection must rely on the eeprom. This patch will make the SerDes detection identical to versions 3.25 and older. Signed-off-by: Michael Chan <mchan@broadcom.com> Acked-by: Grant Grundler <iod00d@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [PATCH] bonding: inherit zero-copy flags of slavesArthur Kepner2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | This change allows a bonding device to inherit the "zero-copy" features of its slave devices. It was inspired by a couple of previous postings on this topic: http://marc.theaimsgroup.com/?l=bonding-devel&m=111924607327794&w=2 http://marc.theaimsgroup.com/?l=bonding-devel&m=111925242706297&w=2 and it's largely a combination of the patches that appear in those emails. Signed-off-by: Arthur Kepner <akepner@sgi.com>
* | [PATCH] macsonic/jazzsonic network drivers updateFinn Thain2005-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of this patch: - Adopt the DMA API (jazzsonic, macsonic & core driver). - Adopt the driver model (macsonic). This part was cribbed from jazzsonic. As a consequence, macsonic once again works as a module. Driver model is also used by the DMA calls. - Support 16 bit cards (macsonic & core driver, also affects jazzsonic) This code was adapted from the mac68k linux 2.2 kernel, where it has languished for a long time. - Support more 32-bit mac cards (macsonic) Also from mac68k repo. - Zero-copy buffer handling (core driver) Provides a nice performance improvement. The new algorithm incidentally helped to replace the old Jazz DMA code. The patch was tested on a variety of macs (several 32-bit quadra built-in NICs, a 16-bit LC PDS NIC and a 16-bit comm-slot NIC), and also on MIPS Jazz. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] mv643xx: add workaround for HW checksum generation bugDale Farnsworth2005-08-23
| | | | | | | | | | | | | | | | | | | | | | [PATCH] [NET] mv643xx: add workaround for HW checksum generation bug The hardware checksum generator on the mv64xxx occasionally generates an incorrect checksum. This patch works around the issue and enables hardware checksum generation. Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] S2io: Hardware fixes for Xframe II adapterravinandan.arakali@neterion.com2005-08-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi, Patch Description: This patch incorporates the following hardware fixes required for Xframe II adapter. 1. New values to program the dtx_control register. 2. Disable memory controller interrupts(MC_INTR) since these are now monitored thru' a poll routine. 3. Don't reset an XframeII card on an ECC double-bit error(It can recover). 4. Save/restore PCI config space before/after a reset irrespective of Xframe I or II card. 5. Bumped up the driver version no. to 2.0.3.1 Please review the patch and apply the same if it looks ok. Signed-off-by: Ravinandan Arakali <ravinandan.arakali@neterion.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] tms380tr: remove prototypes in Space.cJochen Friedrich2005-08-19
| | | | | | | | | | | | | | Cleanup: remove two prototypes. Signed-off-by: Jochen Friedrich <jochen@scram.de> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [netdrvr] Convert madgemc to new MCA API.Jochen Friedrich2005-08-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that all tms380 devices have a valid struct device with dma_mask, remove dmalimit from tmsdev_init(). Kconfig: depend tms380tr and madgemc on MCA. abyss.c, proteon.c, skisa.c, tmspci.c, tms380tr.h: remove dmalimit parameter from tmsdev_init(). tms380tr.c: use device->dma_mask instead of dmalimit. madgemc.c: move to new MCA API using struct device. Signed-off-by: Jochen Friedrich <jochen@scram.de> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [netdrvr eepro100] check for skb==NULL before calling rx_align(skb)Jeff Garzik2005-08-19
| |
* | [PATCH] e1000 printk warning fix 2Andrew Morton2005-08-19
| | | | | | | | | | | | | | | | | | drivers/net/e1000/e1000_main.c: In function `e1000_clean_tx_irq': drivers/net/e1000/e1000_main.c:2774: warning: size_t format, dma_addr_t arg (arg 8) Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] network: fix fmvj18x_cs multicast codeKomuro2005-08-19
| | | | | | | | | | | | | | | | The multicast code of the fmvj18x_cs driver is broken. I fixed it to work properly. Signed-off-by: komurojun-mbn@nifty.com Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] r8169: PCI ID for the Linksys EG1032Francois Romieu2005-08-19
| | | | | | | | | | | | | | | | | | The Linksys EG1032 uses Realtek's 8169 chipset. Credit goes to Bob Wilson <bwilson4web@hotmail.com> for the report. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] net/cycx_drv: replace delay_cycx() with msleep_interruptible()Nishanth Aravamudan2005-08-19
| | | | | | | | | | | | | | | | Use msleep_interruptible() instead of delay_cycx() to guarantee the task delays as expected. Remove the prototype and definition of delay_cycx(). Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] forcedeth: Initialize link settings in every nv_open()Manfred Spraul2005-08-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rüdiger found a bug in nv_open that explains some of the reports with duplex mismatches: nv_open calls nv_update_link_speed for initializing the hardware link speed registers. If current link setting matches the values in np->linkspeed and np->duplex, then the function does nothing. Usually, doing nothing is the right thing, but not in nv_open: During nv_open, the registers must be initialized because the nic was reset. The attached patch fixes that by setting np->linkspeed to an invalid value before calling nv_update_link_speed from nv_open. Signed-Off-By: Manfred Spraul <manfred@colorfullife.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | Merge /spare/repo/linux-2.6/Jeff Garzik2005-08-18
|\|
| * Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6Linus Torvalds2005-08-18
| |\
| | * [PATCH] serverworks: add support for new southbridge IDENarendra Sankar2005-08-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BCM5785 (HT1000) is a Opteron Southbridge from Serverworks/Broadcom that incorporates a single channel ATA100 IDE controller that is functionally identical to the Serverworks CSB6 IDE controller. This patch adds support for the new PCI device ID and also the support for this controller. Signed-off-by: Narendra Sankar <nsankar@broadcom.com> Acked-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
| | * [PATCH] ide: add support for Netcell Revolution to pci-ide generic driverMatt Gillette2005-08-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for Netcell Revolution to pci-ide generic driver by including it in the list of devices matched. Includes the Revolution in the list of simplex devices forced into DMA mode. Signed-off-by: Matt Gillette <matt.gillette@netcell.com> Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
| | * [PATCH] ide: fix PCI_DEVIEC_ID_APPLE_UNI_N_ATA spellingGrant Coady2005-08-18
| | | | | | | | | | | | Signed-off-by: Grant Coady <gcoady@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
| | * [PATCH] ide: fix the BLK_DEV_IDEDMA_PCI dependency for drivers/ide/ppc/pmac.cJuha-Matti Tapio2005-08-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <jmtapio@verkkotelakka.net> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
| | * [PATCH] ide-floppy: fix IDEFLOPPY_TICKS_DELAYBartlomiej Zolnierkiewicz2005-08-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | * IDEFLOPPY_TICKS_DELAY assumed HZ == 100, fix it * increase the delay to 50ms (to match comment in the code) Thanks to Manfred Scherer <manfred.scherer.mhm@t-online.de> for reporting the problem and testing the patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
| * | Merge head 'upstream-fixes' of ↵Linus Torvalds2005-08-18
| |\ \ | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| | * | [PATCH] DM9000 - incorrect ioctl() handlingBen Dooks2005-08-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DM9000 driver is responding to ioctl() calls it should not be. This can cause problems with the wireless tools incorrectly indentifying the device as wireless capable, and crashing under certain operations. This patch also moves the version printk() to the init call, so that you only get it once for multiple devices, and to show it is loaded if there are no defined dm9000s Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-02 09:52:05 -0500