summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Collapse)AuthorAgeFilesLines
* libata: bump versionJeff Garzik2005-05-291-1/+1
|
* Automatic merge of /spare/repo/netdev-2.6 branch use-after-unmap2005-05-2913-4/+28
|\
| * libata: Fix use-after-iounmapJeff Garzik2005-05-2613-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jens Axboe pointed out that the iounmap() call in libata was occurring too early, and some drivers (ahci, probably others) were using ioremap'd memory after it had been unmapped. The patch should address that problem by way of improving the libata driver API: * move ->host_stop() call after all ->port_stop() calls have occurred. * create default helper function ata_host_stop(), and move iounmap() call there. * add ->host_stop_prewalk() hook, use it in sata_qstor.c (hi Mark). sata_qstor appears to require the host-stop-before-port-stop ordering that existed prior to applying the attached patch.
* | [PATCH] drivers/scsi/ahci: add #include req'd for the DMA_{64,32}BIT_MASK ↵domen@coderock.org2005-05-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constants The previous patch did not compile cleanly on all architectures so here's a fixed one which #includes <linux/dma-mapping.h>. Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() This patch includes dma-mapping.h explicitly because it caused errors on some architectures otherwise. See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch> Signed-off-by: Domen Puncer <domen@coderock.org> diff -puN drivers/scsi/ahci.c~dma_mask-drivers_scsi_ahci drivers/scsi/ahci.c
* | [PATCH] drivers/scsi/sata_vsc: add #include req'd for DMA_32BIT_MASK constantdomen@coderock.org2005-05-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous patch did not compile cleanly on all architectures so here's a fixed one which #includes <linux/dma-mapping.h>. Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask() This patch includes dma-mapping.h explicitly because it caused errors on some architectures otherwise. See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch> Signed-off-by: Domen Puncer <domen@coderock.org> diff -puN drivers/scsi/sata_vsc.c~dma_mask-drivers_scsi_sata_vsc drivers/scsi/sata_vsc.c
* | [PATCH] ACPI build fixLen Brown2005-05-271-3/+2
| | | | | | | | | | | | | | | | Fix 2.6.12 CONFIG_ACPI=n build regression. CONFIG_ACPI_BOOT shall be set only if CONFIG_ACPI. Signed-off-by: Len Brown <len.brown@intel.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] Fixup VIA IRQ quirkAlexander Nyberg2005-05-271-1/+1
| | | | | | | | | | | | | | quirk_via_irqpic can't be __devinit for swsuspend Signed-off-by: Alexander Nyberg <alexn@telia.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] VIA IRQ quirkLen Brown2005-05-272-20/+24
| | | | | | | | | | | | | | | | | | | | | | Delete quirk_via_bridge(), restore quirk_via_irqpic() -- but now improved to be invoked upon device ENABLE, and now only for VIA devices -- not all devices behind VIA bridges. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] remove non-cleanroom pwc driver compressionAlan Cox2005-05-2710-2473/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original pwc author raised some questions about the reverse engineering of the decompressor algorithms used in the pwc driver. Having done some detailed investigation it appears those concerns that clean room policy was not followed are reasonable. I've also had a friendly discussion with Philips to ask their view on this. This removes the problem items of code which reduces the pwc functionality in the kernel a little but leaves all the framework for setup that will be needed for decompressors in user space (where they eventually belong). This change set is designed to be the minimal risk change set given that 2.6.12 is hopefully close to hand, with a view to merging the much updated pwc code in 2.6.13 series kernels. Someone else can then redo the decompressors properly (clean room) in user space. Note that while its easy to say that it should have been caught earlier, but the violation was really only obvious to someone who had access to both the proprietary source and the 'GPL' source.
* | ide-cd: revert DMA mask test changeLinus Torvalds2005-05-271-1/+4
| | | | | | | | | | The change to require the DMA length to be only word-aligned was not safe.
* | Automatic merge of ↵Linus Torvalds2005-05-266-1/+12361
|\ \ | | | | | | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
| * | [BNX2]: New Broadcom gigabit network driver.Michael Chan2005-05-265-0/+12360
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new driver bnx2 for Broadcom bcm5706 is available. The patch also includes new 1000BASE-X advertisement bit definitions in mii.h Thanks to David Miller and Jeff Garzik for reviewing and their valuable feedback. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [BONDING]: bonding using arp_ip_target may stay down with active path Jay Vosburgh2005-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | Correcting the list traversal makes the problem go away. Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | Automatic merge of 'for-linus' branch fromLinus Torvalds2005-05-2623-1019/+1222
|\ \ \ | |/ / |/| | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| * | Automatic merge of ↵2005-05-262-0/+3
| |\| | | | | | | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
| * | Automatic merge of /spare/repo/netdev-2.6 branch tlan2005-05-251-0/+12
| |\ \
| | * | [PATCH] fix PROMISC/bridging in TLAN driverJames Harper2005-05-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been a problem for me for ages. When using bridging, the driver is switched into promiscuous mode before the link init is complete. The init complete routine then resets the promisc bit on the card so the kernel still thinks the card is in promiscuous mode but the card isn't. doh. I think this bug only shows up in bridging when the bridge is started at boot time (or something else that sets promisc at the same time the card was started). If promisc is enabled later it works. Here's a trivial (and hopefully correct) patch that works for me. It just calls the promisc/multicast setup routine after init. Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org>
| | * | [PATCH] tlan: restore deleted module parameters.Stephen Hemminger2005-05-151-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The module parameter values got lost in the conversion to the new module_param interface. This should fix it. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Index: tlan/drivers/net/tlan.c ===================================================================
| * | | Automatic merge of /spare/repo/netdev-2.6 branch sis9002005-05-252-3/+50
| |\ \ \
| | * | | [PATCH] SIS900 must select MIIAdrian Bunk2005-05-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the following compile error caused by bk-netdev: <-- snip --> ... LD .tmp_vmlinux1 drivers/built-in.o(.text+0x98528): In function `sis900_get_settings': : undefined reference to `mii_ethtool_gset' drivers/built-in.o(.text+0x98538): In function `sis900_set_settings': : undefined reference to `mii_ethtool_sset' drivers/built-in.o(.text+0x98517): In function `sis900_get_link': : undefined reference to `mii_link_ok' drivers/built-in.o(.text+0x98547): In function `sis900_nway_reset': : undefined reference to `mii_nway_restart' make: *** [.tmp_vmlinux1] Error 1 <-- snip --> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Daniele Venzano <venza@brownhat.org>
| | * | | [PATCH] More ethtool support for sis900 and warning fixDaniele Venzano2005-05-121-3/+49
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to sis900 for the following ethtool ops: - get_link - get_settings - set_settings - nway_reset Signed-off-by: Daniele Venzano <webvenza@libero.it> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | Automatic merge of /spare/repo/netdev-2.6 branch veth2005-05-251-9/+23
| |\ \ \
| | * | | [PATCH] iseries_veth: Cleanup skbs to prevent unregister_netdevice() hangingMichael Ellerman2005-05-151-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi Andrew, Jeff, The iseries_veth driver is badly behaved in that it will keep TX packets hanging around forever if they're not ACK'ed and the queue never fills up. This causes the unregister_netdevice code to wait forever when we try to take the device down, because there's still skbs around with references to our struct net_device. There's already code to cleanup any un-ACK'ed packets in veth_stop_connection() but it's being called after we unregister the net_device, which is too late. The fix is to rearrange the module exit function so that we cleanup any outstanding skbs and then unregister the driver. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
| | * | | [PATCH] iseries_veth: Don't leak skbs in RX pathMichael Ellerman2005-05-151-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi Andrew, Jeff, Under some strange circumstances the iseries_veth driver can leak skbs. Fix is simply to call dev_kfree_skb() in the right place. Fix up the comment as well. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
| | * | | [PATCH] iseries_veth: Set dev->trans_start so watchdog timer works rightMichael Ellerman2005-05-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi Andrew, Jeff, The iseries_veth driver doesn't set dev->trans_start in it's TX path. This will cause the net device watchdog timer to fire earlier than we want it to, which causes the driver to needlessly reset its connections to other LPARs. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
| | * | | [PATCH] iseries_veth: Don't send packets to LPARs which aren't upMichael Ellerman2005-05-151-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi Andrew, Jeff, The iseries_veth driver has a logic bug which means it will erroneously send packets to LPARs for which we don't have a connection. This usually isn't a big problem because the Hypervisor call fails gracefully and we return, but if packets are TX'ed during the negotiation of the connection bad things might happen. Regardless, the right thing is to bail early if we know there's no connection. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
| * | | Automatic merge of /spare/repo/netdev-2.6 branch qeth2005-05-2514-901/+914
| |\ \ \
| | * | | [PATCH] s390: qeth bug fixesFrank Pavlic2005-05-156-404/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [patch 10/10] s390: qeth bug fixes. From: Frank Pavlic <pavlic@de.ibm.com> qeth network driver related changes: - due to OSA hardware changes in TCP Segmentation Offload support we are able now to pack TSO packets too. This fits perfectly in design of qeth buffer handling and sending data respectively. - remove skb_realloc_headroom from the sending path since hard_header_len value provides enough headroom now. - device recovery behaviour improvement - bug fixed in Enhanced Device Driver Packing functionality Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>
| | * | | [PATCH] s390: qeth bug fixesFrank Pavlic2005-05-151-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [patch 9/10] s390: qeth bug fixes. From: Frank Pavlic <pavlic@de.ibm.com> qeth network driver changes: - Use sizeof(__u16) instead of '2' in qeth_fill_header. Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>
| | * | | [PATCH] s390: fakell for high speed token ringFrank Pavlic2005-05-152-27/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [patch 8/10] s390: fakell for high speed token ring. From: Michael Holzheu <holzheu@de.ibm.com> Implement fake-link-layer for high speed token ring. Without it token ring packages get leading ethernet headers, which confuses dhcp. Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>
| | * | | [PATCH] s390: qeth bug fixesFrank Pavlic2005-05-155-111/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [patch 7/10] s390: qeth bug fixes. From: Frank Pavlic <pavlic@de.ibm.com> qeth network driver changes: - Removed redundant code, use the same qeth_fill_buffer_frag for TSO path either - Using skb->frags solely is not correct since skb->data still points to the beginning of the whole data, even when it is a small portion we have to fill the qdio buffer with it. Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>
| | * | | [PATCH] s390: enable iucv_send2way_xxx functionsFrank Pavlic2005-05-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [patch 6/10] s390: enable iucv_send2way_xxx functions. From: Ursula Braun-Krahl <braunu@de.ibm.com> The SSL-Server of z/VM wants to use the iucv_send2way and iucv_send2way_array function. Enable them again. Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>
| | * | | [PATCH] s390: ctc code cleanupFrank Pavlic2005-05-153-414/+490
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [patch 5/10] s390: ctc code cleanup. From: Peter Tiedemann <ptiedem@de.ibm.com> ctc network driver changes: - Some code cleanup. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| | * | | [PATCH] s390: schedule_timeout cleanup in ctcttyFrank Pavlic2005-05-151-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [patch 4/10] s390: schedule_timeout cleanup in ctctty. From: Domen Puncer <domen@coderock.org> Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Maximilian Attems <janitor@sternwelten.at> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Frank Pavlic <pavlic@de.ibm.com> Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| | * | | [PATCH] s390: set online race in the lcs driverFrank Pavlic2005-05-151-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [patch 3/10] s390: set online race in the lcs driver. From: Michael Holzheu <holzheu@de.ibm.com> There is a race between lcs_stopcard() and lcs_open_device() which can lead to the error 'lcs: Error in starting channel, rc=-16'. lcs_open_device() is invoked when 'ifconfig up' is called due to a hotplug event, which is caused by register_netdev(). In parallel lcs_stopcard() is executed. Both functions are sending lcs commands. The second invocation fails with -EBUSY (-16) as return value. Move invocation of register_netdev() after invocation of lcs_stopcard to avoid the race. Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>
| | * | | [PATCH] s390: multicast address registration in lcsFrank Pavlic2005-05-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [patch 2/10] s390: multicast address registration in lcs. From: Michael Holzheu <holzheu@de.ibm.com> When setting lcs devices online you can run into an endless loop, because the code that registers the multicast addresses uses list_for_each_entry instead of list_for_each_entry_safe. Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>
| | * | | [PATCH] s390: claw driver wiringFrank Pavlic2005-05-153-1/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [patch 1/10] s390: claw driver wiring. From: Andy Richter <richtera@us.ibm.com> claw network driver changes: - Add an entry to the drivers/s390/net Makefile to build the claw driver. - Add claw channel type to cu3088. Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>
| * | | Automatic merge of /spare/repo/netdev-2.6 branch ns838202005-05-251-40/+29
| |\ \ \
| | * | | [PATCH] ns83820 updateBenjamin LaHaise2005-05-151-40/+29
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Changes: - improved DAC ifdefs from Andi Kleen - removal of dead code from Adrian Bunk - fix half duplex collision behaviour
| * | | Automatic merge of /spare/repo/netdev-2.6 branch natsemi2005-05-251-3/+3
| |\ \ \
| | * | | [PATCH] Fw: [Bugme-new] [Bug 4482] New: natsemi: incorrect initialization of ↵Herbert Xu2005-05-151-3/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IPv6 Neighbor-discovery multicast On Wed, Apr 13, 2005 at 05:36:42PM +0000, Andrew Morton wrote: > Summary: natsemi: incorrect initialization of IPv6 Neighbor- > discovery multicast I've got a pair of FA312 cards and this problem has bothered me for ages. This has finally prompted me to do something about it :) Turns out that somebody wasn't following the documentation. We were doing 16-bit writes to 32-bit registers which led to some addresses working and others not so lucky. This patch should fix the problem. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| * | | Automatic merge of /spare/repo/netdev-2.6 branch forcedeth2005-05-251-17/+86
| |\ \ \
| | * | | [PATCH] forcedeth: Update error handlingManfred Spraul2005-05-151-17/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ayaz wrote an update to the error handling for forcedeth (which I modified heavily, thus all bugs are mine): The ERROR4 bit is not a fatal error, it just indicates a mismatch between the actual packet len and the len according to the 802.3 header. The patch adds proper handling. The patch also removes the code that drops all packets with RX_ERROR & (!RX_FRAMINGERR): ERROR4 errors are also not fatal.
| | * | | [PATCH] forcedeth: netpoll supportMichal Schmidt2005-05-121-0/+10
| | |/ /
| * | | Automatic merge of /spare/repo/netdev-2.6 branch airo2005-05-251-46/+104
| |\ \ \
| | * | | [PATCH] wireless/airo: WEXT and quality correctionsDan Williams2005-05-151-46/+104
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch brings the airo driver into line with the current WEXT specification of signal quality. It also fixes the values used to determine signal quality and level for MPI & PCMCIA 350 cards. It turns out that BSSListRid.rssi was actually in dBm for 350 series cards, and that we can use the normalized signal strength reported by the card as our "quality" value, on a scale of 0 - 100. Since signal level values are in dBm for this driver, max_qual->level MUST be 0, as specified in the WEXT spec. This patch also uses the IW_QUAL constants new in WEXT version 17. Signed-off-by: Dan Williams <dcbw@redhat.com>
| * | | Automatic merge of /spare/repo/netdev-2.6 branch atmel2005-05-251-0/+1
| |\ \ \
| | * | | [PATCH] atmel wirelesssimon@thekelleys.org.uk2005-05-151-0/+1
| | |/ / | | | | | | | | | | | | | | | | Below is a one-liner for the atmel wireless driver, just adding another card to the table.
* | | | Merge of 'misc-fixes' branch fromLinus Torvalds2005-05-261-6/+7
|\ \ \ \ | | | | | | | | | | | | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
| * | | | [PATCH] libata: Fix zero sg_dma_len() on 64-bit platformAlbert Lee2005-05-261-6/+7
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When testing ATAPI PIO data transfer on the ppc64 platform, __atapi_pio_bytes() got zero when sg_dma_len() is used. I checked the <asm-ppc64/scatterlish.h>, the struct scatterlist is defined as: struct scatterlist { struct page *page; unsigned int offset; unsigned int length; /* For TCE support */ u32 dma_address; u32 dma_length; }; #define sg_dma_address(sg) ((sg)->dma_address) #define sg_dma_len(sg) ((sg)->dma_length) So, if the scatterlist is not DMA mapped, sg_dma_len() will return zero on ppc64. The same problem should occur on the x86-64 platform. On the i386 platform, sg_dma_len() returns sg->length, that's why the problem does not occur on an i386. Changes: - Use sg->length if the scatterlist is not DMA mapped (yet). Signed-off-by: Albert Lee <albertcc@tw.ibm.com>