aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [PKT_SCHED]: Fix dsmark to count ignored indices while walkingThomas Graf2005-05-31
| | | | | | | | Unused indices which are ignored while walking must still be counted to avoid dumping the same index twice. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
* [IPV4]: Fix BUG() in 2.6.x, udp_poll(), fragments + CONFIG_HIGHMEMHerbert Xu2005-05-30
| | | | | | | | | | | | | | | | | | | Steven Hand <Steven.Hand@cl.cam.ac.uk> wrote: > > Reconstructed forward trace: > > net/ipv4/udp.c:1334 spin_lock_irq() > net/ipv4/udp.c:1336 udp_checksum_complete() > net/core/skbuff.c:1069 skb_shinfo(skb)->nr_frags > 1 > net/core/skbuff.c:1086 kunmap_skb_frag() > net/core/skbuff.h:1087 local_bh_enable() > kernel/softirq.c:0140 WARN_ON(irqs_disabled()); The receive queue lock is never taken in IRQs (and should never be) so we can simply substitute bh for irq. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NETFILTER]: Fix deadlock with ip_queue and tcp local input path.Harald Welte2005-05-30
| | | | | | | | | | | | | | | | | | When we have ip_queue being used from LOCAL_IN, then we end up with a situation where the verdicts coming back from userspace traverse the TCP input path from syscall context. While this seems to work most of the time, there's an ugly deadlock: syscall context is interrupted by the timer interrupt. When the timer interrupt leaves, the timer softirq get's scheduled and calls tcp_delack_timer() and alike. They themselves do bh_lock_sock(sk), which is already held from somewhere else -> boom. I've now tested the suggested solution by Patrick McHardy and Herbert Xu to simply use local_bh_{en,dis}able(). Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/tg3-2.6Linus Torvalds2005-05-30
|\
| * Merge of /home/davem/src/GIT/tg3-2.6/David S. Miller2005-05-30
| |\
| | * [TG3]: Fix bug in tg3_load_firmware_cpuMichael Chan2005-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tg3_nvram_lock() and tg3_nvram_unlock() calls around tg3_halt_cpu(). It is possible that the bootcode may be loading code from nvram during this call and stopping the cpu without getting the lock may cause uncompleted nvram data to be left in the nvram data register. Subsequent calls to read/write nvram data will fail. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [TG3]: Add interrupt testMichael Chan2005-05-29
| | | | | | | | | | | | | | | | | | | | | | | | This test uses the previously added tg3_test_interrupt() to perform the test. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [TG3]: Add loopback testMichael Chan2005-05-29
| | | | | | | | | | | | | | | | | | | | | | | | The test will loopback one packet in MAC loopback mode and verify the packet data. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [TG3]: Add memory testMichael Chan2005-05-29
| | | | | | | | | | | | | | | Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [TG3]: Add register testMichael Chan2005-05-29
| | | | | | | | | | | | | | | Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [TG3]: Add parameter to tg3_haltMichael Chan2005-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a reset kind parameter to tg3_halt() so that the RESET_KIND_SUSPEND parameter can be passed to tg3_halt() before doing offline tests. All other calls to tg3_halt() will use the RESET_KIND_SHUTDOWN parameter. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [TG3]: Add link testMichael Chan2005-05-29
| | | | | | | | | | | | | | | Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [TG3]: Add nvram testMichael Chan2005-05-29
| | | | | | | | | | | | | | | Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * [TG3]: Add basic selftest infrastructureMichael Chan2005-05-29
| | | | | | | | | | | | | | | Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [NET]: Use %lx for netdev->features sysfs formatting.David S. Miller2005-05-29
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [IPV6]: Clear up user copy warning in flowlabel code.David S. Miller2005-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | We are intentionally ignoring the copy_to_user() value, make it clear to the compiler too. Noted by Jeff Garzik. Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [NET]: Add ethtool support for NETIF_F_HW_CSUM.Jon Mason2005-05-29
| | | | | | | | | | | | | | | Signed-off-by: Jon Mason <jdmason@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [IPV4]: Kill MULTIPATHHOLDROUTE flag.Pravin B. Shelar2005-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It cannot work properly, so just ignore it in drr and rr multipath algorithms just like the random multipath algorithm does. Suggested by Herbert Xu. Signed-off by: Pravin B. Shelar <pravins@calsoftinc.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [NET]: Add is_multicast_ether_addr() in include/linux/etherdevice.hMichael Ellerman2005-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds is_multicast_ether_addr() to go along with is_valid_ether_addr() and friends. It then changes is_valid_ether_addr() to use the new macro, and fixes up the comment on that function to move implementation details out of the API doco. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [IPV4]: Primary and secondary addressesHarald Welte2005-05-29
|/ / | | | | | | | | | | | | | | | | Add an option to make secondary IP addresses get promoted when primary IP addresses are removed from the device. It defaults to off to preserve existing behavior. Signed-off-by: Harald Welte <laforge@gnumonks.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Automatic merge of 'misc-fixes' branch fromLinus Torvalds2005-05-29
|\ \ | |/ |/| | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
| * libata: bump versionJeff Garzik2005-05-29
| |
| * Automatic merge of /spare/repo/netdev-2.6 branch use-after-unmap2005-05-29
| |\
| | * libata: Fix use-after-iounmapJeff Garzik2005-05-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | [BRIDGE]: receive path optimizationStephen Hemminger2005-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the bridge local receive path by avoiding going through another softirq. The bridge receive path is already being called from a netif_receive_skb() there is no point in going through another receiveq round trip. Recursion is limited because bridge can never be a port of a bridge so handle_bridge() always returns. Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [BRIDGE]: prevent bad forwarding table updatesStephen Hemminger2005-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid poisoning of the bridge forwarding table by frames that have been dropped by filtering. This prevents spoofed source addresses on hostile side of bridge from causing packet leakage, a small but possible security risk. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [BRIDGE]: set features based on enslaved devicesStephen Hemminger2005-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make features of the bridge pseudo-device be a subset of the underlying devices. Motivated by Xen and others who use bridging to do failover. Signed-off-by: Catalin BOIE <catab at umrella.ro> Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [BRIDGE]: make dev->features unsignedStephen Hemminger2005-05-29
| | | | | | | | | | | | | | | | | | | | | | | | The features field in netdevice is really a bitmask, and bitmask's should be unsigned. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [BRIDGE]: features change notificationStephen Hemminger2005-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | Resend of earlier patch (no changes) from Catalin used to provide device feature change notification. Signed-off-by: Catalin BOIE <catab at umbrella.ro> Acked-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | Automatic merge of 'for-linus' branch fromLinus Torvalds2005-05-29
|\ \ \ | | | | | | | | | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input
| * | | Input: Fix fast scrolling scancodes in atkbd.cVojtech Pavlik2005-05-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: synaptics - reduce verboseness of synaptics driver - thereDmitry Torokhov2005-05-28
| | | | | | | | | | | | | | | | | | | | | | | | is no reason one driver should take 10 lines in dmesg. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: yet another model that does not play nicely when i8042 isDmitry Torokhov2005-05-28
| | | | | | | | | | | | | | | | | | | | | | | | put in MUX mode - Fujitsu Lifebook S6230 Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: automatically disable MUX mode on Toshiba Satellite P10Dmitry Torokhov2005-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because it interferes with ALPS touchpad detection and causes horrible death on reboot. Since P10 does not have external PS/2 ports MUX mode does not have any advantages over legacy mode anyway. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: gunze - fix out-of-bound array access reported by Adrian Bunk.Dmitry Torokhov2005-05-28
| | | | | | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: Fix button mapping in joydev - BTN_TRIGGER was beingVojtech Pavlik2005-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mapped twice, resulting in it being the last (instead of first) button on a joystick. Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: Workaround for Sunrex K8561 IR Keyboard/Mouse. The mouseVojtech Pavlik2005-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sends an incorrect ID and wasn't recognized. Reported-by: Stefan Seyfried <seife@suse.de> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: Avoid double unregistering of i8042 PnP driver. This can happenKurt Garloff2005-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when no i8042 controller (not PnP, not legacy) is present. From: Kurt Garloff <garloff@suse.de> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: Tone down the severity of a printk() in i386/ia64 arch codeDmitry Torokhov2005-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for i386, it's printed on many machines and usually is not a cause for worry. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
| * | | Input: Only write the CTR in i8042 resume function. Reading it isVojtech Pavlik2005-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | wrong, since it may (will) contain nonsensical data. Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: Remove (now) unused variable in i8042.cVojtech Pavlik2005-05-28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: Add a missing KERN_INFO message designation, fix behaviorVojtech Pavlik2005-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | when only a keyboard part of the controller is detected. Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input:Adrian Bunk2005-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds dummy gameport_register_port, gameport_unregister_port and gameport_set_phys functions to gameport.h for the case when a driver can't use gameport. This fixes the compilation of some OSS drivers with GAMEPORT=n without the need to #if inside every single driver. This patch also removes the non-working and now obsolete SOUND_GAMEPORT. This patch is also an alternative solution for ALSA drivers with similar problems (but #if's inside the drivers might have the advantage of saving some more bytes of gameport is not available). The only user-visible change is that for GAMEPORT=m the affected OSS drivers are now allowed to be built statically (but they won't have gameport support). Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | Input: Fix a warning in psmouse-base.cAndrew Morton2005-05-28
| |/ / | | | | | | | | | | | | | | | Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | | [PATCH] ppc32: i8259 PIC should not be initialized if PCI is not configuredKumar Gala2005-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to initialize the i8259 PIC will not work if CONFIG_PCI is not enabled. The kernel hangs if the initialization is tried. Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] ppc32: Add soft reset to MPC834xKumar Gala2005-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows mpc83xx_restart to issue a software reset. Signed-off-by: Randy Vinson <rvinson@mvista.com> Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] ppc32: MPC834x BCSR_SIZE too small for use in a BAT.Kumar Gala2005-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The call to io_block_mapping was creating an invalid BAT entry because the value of BCSR_SIZE (32K) is too small to be used in a BAT (128K min). This change removes the io_block_mapping call since these registers can easily be mapped using ioremap at the point of use. Signed-off-by: Randy Vinson <rvinson@mvista.com> Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] ppc32: Simplified load string emulation error checkingKumar Gala2005-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error checking for emulation of load string instructions was overly generous and would cause certain valid forms of the instructions to be treated as illegal. We drop the range checking since the architecture allows this to be boundedly undefined. Tests on CPUs that support these instructions appear not do cause illegal instruction traps on range errors and just allow the execution to occur. Thanks to Kim Phillips for debugging this and figuring out what real HW was doing. Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-22 10:55:50 -0500