aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [ARM] 3690/1: genirq: Introduce and make use of dummy irq chipThomas Gleixner2006-07-01
| | | | | | | | | | | | | | | | Patch from Thomas Gleixner From: Thomas Gleixner <tglx@linutronix.de> ARM has a couple of really dumb interrupt controllers. Implement a generic one and fixup the ARM migration. ARM reused the no_irq_chip for this purpose, but this does not work out for platforms which are not converted to the new interrupt type handling model. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] 3679/1: ARM: Make ARM dyntick implementation work with genirqThomas Gleixner2006-07-01
| | | | | | | | | | | | | | Patch from Thomas Gleixner From: Thomas Gleixner <tglx@linutronix.de> Make the ARM dyntick implementation work with the generic irq code. This hopefully goes away once we consolidated the dyntick implementations. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2006-06-30
|\ | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Kill sun4v virtual device layer. [SERIAL] sunhv: Convert to of_driver layer. [SPARC64]: Mask out top 8-bits in physical address when building resources. [SERIAL] sunsu: Missing return statement in su_probe().
| * [SPARC64]: Kill sun4v virtual device layer.David S. Miller2006-06-30
| | | | | | | | | | | | | | Replace with a simple IRQ translater in the PROM device tree builder. Signed-off-by: David S. Miller <davem@davemloft.net>
| * [SERIAL] sunhv: Convert to of_driver layer.David S. Miller2006-06-30
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * [SPARC64]: Mask out top 8-bits in physical address when building resources.David S. Miller2006-06-30
| | | | | | | | | | | | | | These top 8-bits are supposed to be ignored in the ranges and top-level reg properties on this platform. Signed-off-by: David S. Miller <davem@davemloft.net>
| * [SERIAL] sunsu: Missing return statement in su_probe().David S. Miller2006-06-30
| | | | | | | | | | | | | | If we have a keyboard/mouse port, don't drop through to calling sunsu_autoconfig(). Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-06-30
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IPV6]: Added GSO support for TCPv6 [NET]: Generalise TSO-specific bits from skb_setup_caps [IPV6]: Added GSO support for TCPv6 [IPV6]: Remove redundant length check on input [NETFILTER]: SCTP conntrack: fix crash triggered by packet without chunks [TG3]: Update version and reldate [TG3]: Add TSO workaround using GSO [TG3]: Turn on hw fix for ASF problems [TG3]: Add rx BD workaround [TG3]: Add tg3_netif_stop() in vlan functions [TCP]: Reset gso_segs if packet is dodgy
| * | [IPV6]: Added GSO support for TCPv6Herbert Xu2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds GSO support for IPv6 and TCPv6. This is based on a patch by Ananda Raju <Ananda.Raju@neterion.com>. His original description is: This patch enables TSO over IPv6. Currently Linux network stacks restricts TSO over IPv6 by clearing of the NETIF_F_TSO bit from "dev->features". This patch will remove this restriction. This patch will introduce a new flag NETIF_F_TSO6 which will be used to check whether device supports TSO over IPv6. If device support TSO over IPv6 then we don't clear of NETIF_F_TSO and which will make the TCP layer to create TSO packets. Any device supporting TSO over IPv6 will set NETIF_F_TSO6 flag in "dev->features" along with NETIF_F_TSO. In case when user disables TSO using ethtool, NETIF_F_TSO will get cleared from "dev->features". So even if we have NETIF_F_TSO6 we don't get TSO packets created by TCP layer. SKB_GSO_TCPV4 renamed to SKB_GSO_TCP to make it generic GSO packet. SKB_GSO_UDPV4 renamed to SKB_GSO_UDP as UFO is not a IPv4 feature. UFO is supported over IPv6 also The following table shows there is significant improvement in throughput with normal frames and CPU usage for both normal and jumbo. -------------------------------------------------- | | 1500 | 9600 | | ------------------|-------------------| | | thru CPU | thru CPU | -------------------------------------------------- | TSO OFF | 2.00 5.5% id | 5.66 20.0% id | -------------------------------------------------- | TSO ON | 2.63 78.0 id | 5.67 39.0% id | -------------------------------------------------- Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET]: Generalise TSO-specific bits from skb_setup_capsHerbert Xu2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch generalises the TSO-specific bits from sk_setup_caps by adding the sk_gso_type member to struct sock. This makes sk_setup_caps generic so that it can be used by TCPv6 or UFO. The only catch is that whoever uses this must provide a GSO implementation for their protocol which I think is a fair deal :) For now UFO continues to live without a GSO implementation which is OK since it doesn't use the sock caps field at the moment. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [IPV6]: Added GSO support for TCPv6Herbert Xu2006-06-30
| | | | | | | | | | | | | | | | | | | | | This patch adds GSO support for IPv6 and TCPv6. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [IPV6]: Remove redundant length check on inputHerbert Xu2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to check skb->len when we're just about to call pskb_may_pull since that checks it for us. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NETFILTER]: SCTP conntrack: fix crash triggered by packet without chunksPatrick McHardy2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a packet without any chunks is received, the newconntrack variable in sctp_packet contains an out of bounds value that is used to look up an pointer from the array of timeouts, which is then dereferenced, resulting in a crash. Make sure at least a single chunk is present. Problem noticed by George A. Theall <theall@tenablesecurity.com> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [TG3]: Update version and reldateMichael Chan2006-06-30
| | | | | | | | | | | | | | | | | | | | | Update version to 3.61. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [TG3]: Add TSO workaround using GSOMichael Chan2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use GSO to workaround a rare TSO bug on some chips. This hardware bug may be triggered when the TSO header size is greater than 80 bytes. When this condition is detected in a TSO packet, the driver will use GSO to segment the packet to workaround the hardware bug. Thanks to Juergen Kreileder <jk@blackdown.de> for reporting the problem and collecting traces to help debug the problem. And thanks to Herbert Xu <herbert@gondor.apana.org.au> for providing the GSO mechanism that happens to be the perfect workaround for this problem. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [TG3]: Turn on hw fix for ASF problemsMichael Chan2006-06-30
| | | | | | | | | | | | | | | | | | | | | Clear a bit to enable a hardware fix for some ASF related problem. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [TG3]: Add rx BD workaroundMichael Chan2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add workaround to limit the burst size of rx BDs being DMA'ed to the chip. This works around hardware errata on a number of 5750, 5752, and 5755 chips. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [TG3]: Add tg3_netif_stop() in vlan functionsMichael Chan2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | Add tg3_netif_stop() when changing the vlgrp (vlan group) pointer. It is necessary to quiesce the device before changing that pointer. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [TCP]: Reset gso_segs if packet is dodgyHerbert Xu2006-06-30
| |/ | | | | | | | | | | | | | | | | | | | | | | I wasn't paranoid enough in verifying GSO information. A bogus gso_segs could upset drivers as much as a bogus header would. Let's reset it in the per-protocol gso_segment functions. I didn't verify gso_size because that can be verified by the source of the dodgy packets. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge branch 'for-linus' of ↵Linus Torvalds2006-06-30
|\ \ | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IB/core: Set alternate port number when initializing QP attributes IB/uverbs: Set correct user handle for user SRQs
| * | IB/core: Set alternate port number when initializing QP attributesSean Hefty2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | Set alternate port number when initializing QP attributes. This bug is OpenFabrics bugzilla bug #160. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * | IB/uverbs: Set correct user handle for user SRQsRoland Dreier2006-06-30
| |/ | | | | | | | | | | | | | | | | | | Store away the user handle passed in from userspace when creating an SRQ, so that the kernel can return the correct handle when an SRQ asynchronous event occurs. (A 0 was incorrectly stored as the user handle as part of the changes in 9ead190b, "IB/uverbs: Don't serialize with ib_uverbs_idr_mutex") Signed-off-by: Roland Dreier <rolandd@cisco.com>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivialLinus Torvalds2006-06-30
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: Remove obsolete #include <linux/config.h> remove obsolete swsusp_encrypt arch/arm26/Kconfig typos Documentation/IPMI typos Kconfig: Typos in net/sched/Kconfig v9fs: do not include linux/version.h Documentation/DocBook/mtdnand.tmpl: typo fixes typo fixes: specfic -> specific typo fixes in Documentation/networking/pktgen.txt typo fixes: occuring -> occurring typo fixes: infomation -> information typo fixes: disadvantadge -> disadvantage typo fixes: aquire -> acquire typo fixes: mecanism -> mechanism typo fixes: bandwith -> bandwidth fix a typo in the RTC_CLASS help text smb is no longer maintained Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S
| * | Remove obsolete #include <linux/config.h>Jörn Engel2006-06-30
| | | | | | | | | | | | | | | Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | remove obsolete swsusp_encryptPavel Machek2006-06-30
| | | | | | | | | | | | | | | | | | | | | Remove SWSUSP_ENCRYPT config option; it is no longer implemented. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | arch/arm26/Kconfig typosMatt LaPlante2006-06-30
| | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | Documentation/IPMI typosMatt LaPlante2006-06-30
| | | | | | | | | | | | | | | Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | Kconfig: Typos in net/sched/KconfigMatt LaPlante2006-06-30
| | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | v9fs: do not include linux/version.hPaul Collins2006-06-30
| | | | | | | | | | | | | | | | | | | | | I noticed that part of v9fs was being rebuilt when version.h changed. Signed-off-by: Paul Collins <paul@ondioline.org> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | Documentation/DocBook/mtdnand.tmpl: typo fixesPatrick Pletscher2006-06-30
| | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | typo fixes: specfic -> specificAdrian Bunk2006-06-30
| | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | typo fixes in Documentation/networking/pktgen.txtAdrian Bunk2006-06-30
| | | | | | | | | | | | | | | | | | Three typos in only one line... Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | typo fixes: occuring -> occurringAdrian Bunk2006-06-30
| | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | typo fixes: infomation -> informationAdrian Bunk2006-06-30
| | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | typo fixes: disadvantadge -> disadvantageAdrian Bunk2006-06-30
| | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | typo fixes: aquire -> acquireAdrian Bunk2006-06-30
| | | | | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | typo fixes: mecanism -> mechanismAdrian Bunk2006-06-30
| | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | typo fixes: bandwith -> bandwidthAdrian Bunk2006-06-30
| | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | fix a typo in the RTC_CLASS help textAdrian Bunk2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a typo spotted by Matt LaPlante <webmaster@cyberdogtech.com>. This patch fixes kernel Bugzilla #6704. Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | smb is no longer maintainedAdrian Bunk2006-06-30
| | | | | | | | | | | | | | | | | | The smb filesystem in the Linux kernel is unmaintained for years. Signed-off-by: Adrian Bunk <bunk@stusta.de>
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6/Linus Torvalds2006-06-30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6/: [PATCH] pcmcia: fix deadlock in pcmcia_parse_events [PATCH] com20020_cs: more device support [PATCH] au1xxx: pcmcia: fix __init called from non-init [PATCH] kill open-coded offsetof in cm4000_cs.c ZERO_DEV() [PATCH] pcmcia: convert pcmcia_cs to kthread [PATCH] pcmcia: fix kernel-doc function name [PATCH] pcmcia: hostap_cs.c - 0xc00f,0x0000 conflicts with pcnet_cs [PATCH] pcmcia: at91_cf suspend/resume/wakeup [PATCH] pcmcia: Make ide_cs work with the memory space of CF-Cards if IO space is not available [PATCH] pcmcia: TI PCIxx12 CardBus controller support [PATCH] pcmcia: warn if driver requests exclusive, but gets a shared IRQ [PATCH] pcmcia: expose tool in pcmcia/Documentation/pcmcia/ [PATCH] pcmcia: another ID for serial_cs.c [PATCH] yenta: fix hidden PCI bus numbers [PATCH] yenta: do power-up only after socket is configured
| * | | [PATCH] pcmcia: fix deadlock in pcmcia_parse_eventsArjan van de Ven2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PCMCIA layer calls pcmcia_parse_events both from user context and IRQ context; the lock thus needs to be irqsave to avoid deadlocks Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | | [PATCH] com20020_cs: more device supportMarc Sowen2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the com20020_cs arcnet driver to see the SoHard (now Mercury Computer Systems Inc.) SH ARC-PCMCIA card. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | | [PATCH] au1xxx: pcmcia: fix __init called from non-initDomen Puncer2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This must not be marked __init, as it is called from au1x00_drv_pcmcia_probe. Signed-off-by: Domen Puncer <domen.puncer@ultra.si> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | | [PATCH] kill open-coded offsetof in cm4000_cs.c ZERO_DEV()Al Viro2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to make sure that it doesn't break again when a field changes (see "[PATCH] pcmcia: fix zeroing of cm4000_cs.c data" for recent example). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | | [PATCH] pcmcia: convert pcmcia_cs to kthreadSerge E. Hallyn2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert pcmcia_cs to use kthread instead of the deprecated kernel_thread. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | | [PATCH] pcmcia: fix kernel-doc function nameRandy Dunlap2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix kernel-doc function name spello. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | | [PATCH] pcmcia: hostap_cs.c - 0xc00f,0x0000 conflicts with pcnet_csKomuro2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comment out the ID 0xc00f,0x0000 in hostap_cs.c, as it conflicts with the pcnet_cs driver. Signed-off-by: komurojun-mbn@nifty.com Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | | [PATCH] pcmcia: at91_cf suspend/resume/wakeupDavid Brownell2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AT91 CF updates, mostly for power management: - Add suspend/resume methods to the AT91 CF driver, disabling non-wakeup IRQs during system suspend. The card detect IRQ serves as a wakeup event source. - Convert the driver to the more-current "platform_driver" style. So inserting or removing a CF card will wake the system, unless that has been disabled by updating the sysfs file; and there will be no more warnings about spurious IRQs during suspend/resume cycles. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | | [PATCH] pcmcia: Make ide_cs work with the memory space of CF-Cards if IO ↵Thomas Kleffel2006-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | space is not available This patch enables ide_cs to access CF-cards via their common memory rather than via their IO space. Signed-off-by: Thomas Kleffel <tk@maintech.de> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>