aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Collapse)AuthorAge
* Merge branch 'upstream-fixes'Jeff Garzik2006-03-11
|\
| * [PATCH] 3c509: bus registration fixAndrew Morton2006-03-11
| | | | | | | | | | | | | | | | | | - Don't call eisa_driver_unregister() if eisa_driver_register() failed. - Properly propagate error values. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] de620: fix section mismatch warningSam Ravnborg2006-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In latest -mm de620 gave following warning: WARNING: drivers/net/de620.o - Section mismatch: reference to \ .init.text:de620_probe from .text between 'init_module' (at offset \ 0x1682) and 'cleanup_module' init_module() call de620_probe() which is declared __init. Fix is to declare init_module() __init too. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] NE2000 Kconfig help entry improvementJesper Juhl2006-03-11
| | | | | | | | | | | | | | | | | | Improve reference to PCI NE2K support in ISA NE2K documentation. Original 2.4 patch From: Ged Haywood <ged@jubileegroup.co.uk> Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] dl2k: DMA freeing errorJon Mason2006-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes an error in the dl2k driver's DMA mapping/unmapping. The adapter uses the upper 16bits of the DMA address for the buffer size. However, this is not masked off when referencing the DMA address, and can lead to errors by trying to free a DMA address out of range. Thanks, Jon Signed-off-by: Jon Mason <jdmason@us.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * [PATCH] Wrong return value corrupts free object in e1000 driverDavid S. Miller2006-03-11
| | | | | | | | | | | | | | | | | | | | | | For some reason, E1000's ->hard_start_xmit() routine returns -EFAULT instead of one of the NETDEV_TX_* error codes. In fact, it frees up the SKB before returning this. This makes the queueing layer think the packet should be requeued and subsequently we corrupt a freed object. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sky2: truncate oversize packetsStephen Hemminger2006-03-09
| | | | | | | | | | | | | | Turn on truncation to prevent getting choked by frames larger than expected. Without this fix, driver hangs after receiving an oversize packet. Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
| * sky2: force early transmit interruptsStephen Hemminger2006-03-09
| | | | | | | | | | | | | | | | | | | | Avoid premature transmit ring full conditions. Force a transmit status interrupt if transmit ring gets nearly full and after a TSO send. Allow more entries in transmit ring to be used if dma_addr is 32 bits Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
| * sky2: not random enoughStephen Hemminger2006-03-09
| | | | | | | | | | | | | | Don't use sky2 to seed random pool beacause the network packet arrival time will not be truly random due to NAPI and interrupt mitigation. Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
| * de2104x: fix the TX watchdogFrancois Romieu2006-03-09
| | | | | | | | | | | | | | Insert de_init_rings() to reinit the rings before de_init_hw() tries to access them again. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * de2104x: prevent interrupt before the interrupt handler is registeredFrancois Romieu2006-03-09
| | | | | | | | | | | | | | de_init_hw enables the irq thus it must be issued after request_irq. Signed-off-by: Martin Michlmayr <tbm@cyrius.com> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * [TG3]: Add DMA address workaroundMichael Chan2006-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add DMA workaround for chips that do not support full 64-bit DMA addresses. 5714, 5715, and 5780 chips only support DMA addresses less than 40 bits. On 64-bit systems with IOMMU, set the dma_mask to 40-bit so that pci_map_xxx() calls will map the DMA address below 40 bits if necessary. On 64-bit systems without IOMMU, set the dma_mask to 64-bit and check for DMA addresses exceeding the limit in tg3_start_xmit(). 5788 only supports 32-bit DMA so need to set the mask appropriately also. Thanks to Chris Elmquist at SGI for reporting and helping to debug the problem on 5714. Thanks to David Miller for explaining the HIGHMEM and DMA stuff. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge branch 'upstream-fixes'Jeff Garzik2006-03-06
|\|
| * [PATCH] chelsio: fix kmalloc failure in t1_espi_createEric Sesterhenn2006-03-06
| | | | | | | | | | | | | | | | memset() is called before check. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | Fix io ordering problems in e100Catalin(ux aka Dino) BOIE2006-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking e100.c code against Documentation/io_ordering.txt I found the following problem: spin_lock_irq... write spin-unlock e100_write_flush The attached patch fix the code like this: spin_lock_irq... write e100_write_flush spin-unlock Signed-off-by: Catalin BOIE <catab@umbrella.ro> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | [PATCH] natsemi: NAPI and a bugfixMark Brown2006-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As documented in National application note 1287 the RX state machine on the natsemi chip can lock up under some conditions (mostly related to heavy load). When this happens a series of bogus packets are reported by the chip including some oversized frames prior to the final lockup. This patch implements the fix from the application note: when an oversized packet is reported it resets the RX state machine, dropping any currently pending packets. Signed-off-by: Mark Brown <broonie@sirena.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | [PATCH] natsemi: NAPI and a bugfixMark Brown2006-03-04
| | | | | | | | | | | | | | | | | | | | | | This patch converts the natsemi driver to use NAPI. It was originally based on one written by Harald Welte, though it has since been modified quite a bit, most extensively in order to remove the ability to disable NAPI since none of the other drivers seem to provide that functionality any more. Signed-off-by: Mark Brown <broonie@sirena.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | Merge branch 'upstream-fixes'Jeff Garzik2006-03-04
|\|
| * s2io: set_multicast_list bugJeff Garzik2006-03-04
| | | | | | | | | | | | | | | | | | | | The mac_addr variable doesn't get reset between (re)additions of multicast addresses. One byte of all multicast addresses (except the first) can be incorrect. Signed-off-by: Arthur Kepner <akepner@sgi.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | [PATCH] remove obsolete sis900 documentationAdrian Bunk2006-03-04
| | | | | | | | | | | | | | | | This documentation is mostly obsolete, and should therefore either be updated or removed (this patch does the latter). Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | Merge branch 'net-const'Jeff Garzik2006-03-03
|\ \
| * | Massive net driver const-ification.Arjan van de Ven2006-03-03
| |/
| * Merge branch 'upstream-fixes' of ↵Linus Torvalds2006-03-01
| |\ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| * | [PATCH] pcmcia: add id for AMB8110 PC CardJesse Allen2006-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The axnet_cs driver can support the AMB8110 PC Card, so add the id for it. In the old pcmcia-cs config file, this card is listed with the comment "not specific enough". The last entry in the axnet_ids has the same comment. They are disabled, and for good reason as it was originally identified by the MANFID, and that is shared with several cards that use both the pcnet_cs driver and axnet_cs driver. I tried my AMB8110 with pcnet_cs, and found that it works fine, and I cannot find a reason for either, except that the old config file recommended axnet_cs. Signed-off-by: Jesse Allen <the3dfxdude@gmail.com> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | [PATCH] pcmcia: avoid binding hostap_cs to Orinoco cardsPavel Roskin2006-03-01
| | | | | | | | | | | | | | | | | | | | | | | | Don't just use cards with PCMCIA ID 0x0156, 0x0002. Make sure that the vendor string is "Intersil" or "INTERSIL" Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
* | | [PATCH] sb1250-mac: Add support for the BCM1480Ralf Baechle2006-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for the 4th port and other new features of the BCM1480 SOC. Signed-Off-By: Andy Isaacson <adi@broadcom.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | pcnet_cs: add new id (Logitec LPM-LN100TE)Komuro2006-03-03
| | |
* | | [PATCH] bonding: suppress duplicate packetsJay Vosburgh2006-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally submitted by Kenzo Iwami; his original description is: The current bonding driver receives duplicate packets when broadcast/ multicast packets are sent by other devices or packets are flooded by the switch. In this patch, new flags are added in priv_flags of net_device structure to let the bonding driver discard duplicate packets in dev.c:skb_bond(). Modified by Jay Vosburgh to change a define name, update some comments, rearrange the new skb_bond() for clarity, clear all bonding priv_flags on slave release, and update the driver version. Signed-off-by: Kenzo Iwami <k-iwami@cj.jp.nec.com> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] mv643xx_eth: Remove BIT0-BIT31 #definesDale Farnsworth2006-03-03
| | | | | | | | | | | | | | | | | | | | | | | | Now that the BIT0-BIT31 defines are no longer used by mv643xx_eth.c, remove them from mv643xx_eth.h. Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] mv643xx_eth: Remove non-working feature: task level rx queue refillDale Farnsworth2006-03-03
| | | | | | | | | | | | | | | | | | | | | | | | The task level rx queue refill feature hasn't ever worked (at least in 2.6) and is of dubious value. Remove it. Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] mv643xx_eth: Clean up interrupt handlingDale Farnsworth2006-03-03
| | | | | | | | | | | | | | | Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] mv643xx_eth: Move #defines of constants to mv643xx_eth.hDale Farnsworth2006-03-03
| | | | | | | | | | | | | | | Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] mv643xx_eth: Refactor/clean up tx queue handlingDale Farnsworth2006-03-03
| | | | | | | | | | | | | | | Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] mv643xx_eth: Refactor tx command queuing codeDale Farnsworth2006-03-03
| | | | | | | | | | | | | | | | | | | | | | | | Simplify and remove redundant code for filling transmit descriptors. No changes in features; it's just a code reorganization/cleanup. Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] mv643xx_eth: Select CONFIG_MII on CONFIG_MV643XX_ETHDale Farnsworth2006-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | >From : Dale Farnsworth <dale@farnsworth.org> Recent patches for the mv643xx_eth driver now use the MII interface library. Select MII so it gets built when that driver is selected. Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] mv643xx_eth: Rename "channels" to "queues"Dale Farnsworth2006-03-03
| | | | | | | | | | | | | | | | | | | | | Use better terminology for HW queues. No functional changes. Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] mv643xx_eth: Fix misplaced parenthesis in mv643xx_eth_port_disable_rxDale Farnsworth2006-03-03
| | | | | | | | | | | | | | | | | | | | | This bug could result in a system hang. Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] mv643xx_eth: Remove duplicate includes of linux/in.h and linux/ip.hDale Farnsworth2006-03-03
| | | | | | | | | | | | | | | Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | e1000: Added driver comments and whitespace changes. Modified long lines of ↵Jeff Kirsher2006-03-02
| | | | | | | | | | | | | | | | | | | | | | | | code to ensure they would not wrap beyond 80 characters. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
* | | e1000: Added a performance enhancement - prefetchJeff Kirsher2006-03-02
| | | | | | | | | | | | | | | | | | | | | | | | - this implementation of prefetch was tested on new and old hardware Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
* | | e1000: Add copybreak when using packet splitJeff Kirsher2006-03-02
| | | | | | | | | | | | | | | | | | Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
* | | e1000: Fixed the following issues with ESB2 (requires ESB2 support):Jeff Kirsher2006-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add restriction for ESB2 to MTU size <=9216 - Removed FIFO errors which were not being used - Fixed issues with loopback - Power management change for saving state and config space - WA to disable recieves and reset device on link loss. Reset needed to be done outside the interrupt context - modified existing tx_timeout_task Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
* | | e1000: Add support for new hardware (ESB2)Jeff Kirsher2006-03-02
| | | | | | | | | | | | | | | | | | Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
* | | e1000: Add performance enahancement by balancing TX and RXJeff Kirsher2006-03-02
| | | | | | | | | | | | | | | | | | Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
* | | e1000: Add enabled Jumbo frame support for 82573LJeff Kirsher2006-03-02
| | | | | | | | | | | | | | | | | | Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
* | | e1000: Add 82573 controller support to TSO fixJeff Kirsher2006-03-02
| | | | | | | | | | | | | | | | | | Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
* | | e1000: Fix filling skb descriptors while using packet splitJeff Kirsher2006-03-02
| | | | | | | | | | | | | | | | | | | | | | | | - Simplified by calling skb_fill_page_desc(), which is more efficient. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
* | | e1000: Fix network problems when forced at 100Mb/s and to fix TSO when ↵Jeff Kirsher2006-03-02
| | | | | | | | | | | | | | | | | | | | | | | | forced at 100Mb/s Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
* | | e1000: Fix Quadport Wake on LANJeff Kirsher2006-03-02
| | | | | | | | | | | | | | | | | | Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>
* | | e1000: Fix RSS if enabled in mid-connectionJeff Kirsher2006-03-02
| | | | | | | | | | | | | | | | | | Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com>