aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2005-09-01[CRYPTO]: Added CRYPTO_TFM_REQ_MAY_SLEEP flagHerbert Xu4-6/+5
The crypto layer currently uses in_atomic() to determine whether it is allowed to sleep. This is incorrect since spin locks don't always cause in_atomic() to return true. Instead of that, this patch returns to an earlier idea of a per-tfm flag which determines whether sleeping is allowed. Unlike the earlier version, the default is to not allow sleeping. This ensures that no existing code can break. As usual, this flag may either be set through crypto_alloc_tfm(), or just before a specific crypto operation. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-01[CRYPTO]: Fix XTEA implementationAaron Grothe5-29/+207
The XTEA implementation was incorrect due to a misinterpretation of operator precedence. Because of the wide-spread nature of this error, the erroneous implementation will be kept, albeit under the new name of XETA. Signed-off-by: Aaron Grothe <ajgrothe@yahoo.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-01[TG3]: Update driver version and release date.David S. Miller1-2/+2
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-01[TG3]: Minimize locking in TX path.Michael Chan1-11/+13
This is similar to Eric Dumazet's tx_lock patch for tg3 but takes it one step further to eliminate the tx_lock in the tx_completion path when the tx queue is not stopped. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-01[SUNGEM]: Fix netpoll bug in Sun GEM Ether driverEric Lemoine1-0/+1
From: Eric Lemoine <eric.lemoine@gmail.com> To me the bug is that __LINK_STATE_RX_SCHED can be set while __netif_rx_schedule() hasen't be called. Why don't fix it in the simplest way ? See attached patch (absolutely untested). Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-01[SUNGEM]: fix minor bug in sungem.hGeoff Levand1-1/+1
This changes the Sun Gem Ether driver's tx ring buffer length to the proper constant. Currently TX_RING_SIZE and RX_RING_SIZE are equal, so no malfunction occurs. Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-01[IPVS]: "extern inline" -> "static inline"Adrian Bunk1-1/+1
"extern inline" doesn't make much sense. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-01[TUNTAP]: Allow setting the linktype of the tap device from userspaceMike Kershaw2-0/+16
Currently tun/tap only supports the EN10MB ARP type. For use with wireless and other networking types it should be possible to set the ARP type via an ioctl. Patch v2: Included check that the tap interface is down before changing the link type out from underneath it Signed-off-by: Mike Kershaw <dragorn@kismetwireless.net> Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-01[PATCH] ppc: L2 cache prefetch fixes on 745xKumar Gala2-2/+34
We run into problems if we blindly enable L2 prefetching without checking that the L2 cache is actually enabled. Additionaly, if we disable the L2 cache we need to ensure that we disable L2 prefetching. Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-01[PATCH] Fix PCI ROM mappingBenjamin Herrenschmidt1-7/+17
This fixes a problem with pci_map_rom() which doesn't properly update the ROM BAR value with the address thas allocated for it by the PCI code. This problem, among other, breaks boot on Mac laptops. It'ss a new version based on Linus latest one with better error checking. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-01[PATCH] Fix bug in ppc64 dynamic hugepage supportDavid Gibson1-13/+9
In adjusting the logic for SLB miss for the dynamic hugepage stuff, I messed up the !CONFIG_HUGETLB_PAGE case, failing to set the SLB flags properly. This fixes it. It also streamlines the logic for the HUGETLB_PAGE case (removing a couple of branches) while we're at it. Booted, and roughly tested on POWER5 (with and without HUGETLB_PAGE), iSeries/RS64 (no hugepage available), and G5 (with and without HUGETLB_PAGE). Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-01[PATCH] Add missing select's to DVB_BUDGET_AVAdrian Bunk1-0/+3
This fixes the following compile error: ... LD .tmp_vmlinux1 drivers/built-in.o: In function `frontend_init': budget-av.c:(.text+0xb9448): undefined reference to `tda10046_attach' budget-av.c:(.text+0xb9518): undefined reference to `tda10021_attach' drivers/built-in.o: In function `philips_tu1216_request_firmware': budget-av.c:(.text+0xb937b): undefined reference to `request_firmware' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Johannes Stezenbach <js@linuxtv.org> Acked-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-08-30Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git Linus Torvalds30-90/+11159
2005-08-30[PATCH] ppc32 8xx: fix warnings in m8xx_setup.cMarcelo Tosatti1-3/+3
The following patch fixes two warnings in arch/ppc/syslib/m8xx_setup.c Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-08-30[PATCH] x86: pci_assign_unassigned_resources() updateIvan Kokshaysky3-35/+17
I had some time to think about PCI assign issues in 2.6.13-rc series. The major problem here is that we call pci_assign_unassigned_resources() way too early - at subsys_initcall level. Therefore we give no chances to ACPI and PnP routines (called at fs_initcall level) to reserve their respective resources properly, as the comments in drivers/pnp/system.c and drivers/acpi/motherboard.c suggest: /** * Reserve motherboard resources after PCI claim BARs, * but before PCI assign resources for uninitialized PCI devices */ So I moved the pci_assign_unassigned_resources() call to pcibios_assign_resources() (fs_initcall), which should hopefully fix a lot of problems and make PCIBIOS_MIN_IO tweaks unnecessary. Other changes: - remove resource assignment code from pcibios_assign_resources(), since it duplicates pci_assign_unassigned_resources() functionality and actually does nothing in 2.6.13; - modify ROM assignment code as per Ben's suggestion: try to use firmware settings by default (if PCI_ASSIGN_ROMS is not set); - set CARDBUS_IO_SIZE back to 4K as it's a wonderful stress test for various setups. Confirmed by Tero Roponen <teanropo@cc.jyu.fi> (who had problems with the 4kB CardBus IO size previously). Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-08-30Merge HEAD from /spare/repo/linux-2.6/.git Jeff Garzik661-11418/+29643
2005-08-30Merge refs/heads/for-linus from master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git Linus Torvalds1-3/+2
2005-08-30Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa Linus Torvalds84-700/+2033
2005-08-30Merge refs/heads/drm-latest from master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 Linus Torvalds57-3243/+7407
2005-08-30[ALSA] usb-audio: throttle MIDI URB resubmits on USB errorsClemens Ladisch1-13/+64
USB generic driver When a USB error occurs that might indicate that the device has been unplugged, don't resubmit the URB immediately to prevent flooding the log with error messages before khubd has us disconnect()ed. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30[PATCH] Assign device pointer to OSS devicesTakashi Iwai3-11/+25
Add register_sound_special_device() function to allow assignment of device pointer to a specific OSS device for HAL. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] version 1.0.10rc1Jaroslav Kysela1-2/+2
2005-08-30[ALSA] Add identification for Live 5.1 [SB0220]Lee Revell1-0/+7
EMU10K1/EMU10K2 driver Add identification for Live 5.1 [SB0220] Signed-off-by: Lee Revell <rlrevell@joe-job.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] emu10k1 - Add missing ac97 support on SBLive! Player 5.1Takashi Iwai1-0/+1
EMU10K1/EMU10K2 driver Added the missing ac97 support on SBLive! Player 5.1. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] intel8x0 - Add quirk for FSC 4010Takashi Iwai1-0/+6
Intel8x0 driver Added ac97_quirk for FSC 4010. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] pcm - Fix zero-division in 32bit compat layerTakashi Iwai1-3/+8
PCM Midlevel Fixed zero-division bug in PCM 32bit compat layer. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] intel8x0 - add AC97_TUNE_MUTE_LED quirk for HP nx8220 laptop 103c:0934Daniel Horchner1-0/+6
Intel8x0 driver Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30[ALSA] usb-audio: fix Emagic MIDI protocol handlingClemens Ladisch1-5/+12
USB generic driver Emagic devices pad their packets not with 0xff bytes but with a 0xff byte followed by garbage, so we have to stop at the first such byte. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2005-08-30[ALSA] Fix missing spin_unlockTakashi Iwai2-2/+3
au88x0 driver,Common EMU synth Fixed missing spin_unlock. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] include/sound/gus.h: 'extern inline' -> 'static inline'Adrian Bunk1-4/+4
GUS Library 'extern inline' doesn't make much sense. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] hda-intel - Fix ULI M5461 supportTakashi Iwai1-33/+117
HDA Intel driver Fix and clean up for the support of ULI M5461 - set CORB/RIRB sizes explicitly - add workarounds for ULI on ia32 - max number of streams depends on the chip type now - increase the size of BDL Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] hda-codec - Add beep support for UniwillTakashi Iwai1-1/+7
HDA Codec driver Added the missing beep support for Uniwill laptop (ALSA bug#1358). Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] vxpocket - Register device pointerTakashi Iwai1-0/+1
Digigram VX Pocket driver Add snd_card_set_dev() to register the device pointer. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] vxpocket - Fix wrong index assignmentTakashi Iwai1-1/+1
Digigram VX Pocket driver Fixed the wrong index number assignment. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] vxpocket - Add missing event callbackTakashi Iwai1-4/+5
Digigram VX Pocket driver Added the missing event callback. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] Fix compilation without CONFIG_PROC_FSTakashi Iwai1-2/+1
Memalloc module Fix an error when built without CONFIG_PROC_FS. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] hda-codec - Code clean upTakashi Iwai1-11/+18
HDA Codec driver Use struct instead of array to improve the readability of hda_codec.c. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] hda-intel - correct a bug in detection of rate supportedNicolas Graziano1-1/+5
HDA Codec driver The insertion of the rate 9600 make a shift in detection of supported rate, put this rate at the end of the list. Signed-off-by: Nicolas Graziano <nicolas.graziano@wanadoo.fr> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] HP nx6110 quirksSergey Vlasov2-0/+7
Intel8x0 driver,AC97 Codec The HP nx6110 laptop needs to have Headphone Jack Sense enabled so that the internal speakers will be turned off when headphones are plugged in. Also ac97_quirk=hp_only is needed to make a single Master volume in the mixer instead of separate volumes for internal speakers and headphones, which just confuses the user. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] ac97_bus - revert last change and do it only in the ALSA treeJaroslav Kysela1-1/+1
AC97 Codec Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30[ALSA] ac97_bus - replace <linux/module.h> with <sound/driver.h> for consistencyJaroslav Kysela1-1/+1
AC97 Codec Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30[ALSA] via82xx - Add DXS entry for MSI 7142Takashi Iwai1-0/+1
VIA82xx driver Added the DXS entry for MSI 7142 (K8MM-V). Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] PCM resume cleanupsJaroslav Kysela8-19/+32
Digigram VX core,CS4231 driver,ATIIXP driver,VIA82xx driver VIA82xx-modem driver,au88x0 driver,CS46xx driver,Trident driver This patch disables SNDRV_PCM_INFO_RESUME flag for drivers which does not support the full resume. Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30[ALSA] ac97 - make ac97 codec device name uniqueBjorge Dijkstra1-1/+1
AC97 Codec The patch fixes the bus_id conflict error when registering two codecs of the same type (ALSA bug#1334). Signed-off-by: Bjorge Dijkstra <bjorge@gmx.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] hdspm - Fix module parameter descriptionTakashi Iwai1-1/+1
RME9652 driver Fix the module parameter description after proofreading. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] nm256 - Fix PM and irq handlingTakashi Iwai1-23/+70
NM256 driver - Fixed the PCM resume - restoring the rate setting - Fixed the handling of buggy irqs - Dynamically acquire/release irq handler to make the driver more robust to unknown irq storms (as OSS driver does). Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] intel8x0 - Fix PMTakashi Iwai1-8/+31
Intel8x0 driver Fixed the PCM resume of intel8x0. Restores the requested register setting. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2005-08-30[ALSA] ALSA timer - fixed compilationJaroslav Kysela1-2/+2
Timer Midlevel Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30[ALSA] Timer API - SNDRV_TIMER_EVENT_RESUME - val is resolution in nsJaroslav Kysela1-1/+1
ALSA Core Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2005-08-30[ALSA] Timer API - added SUSPEND/RESUME eventsJaroslav Kysela3-6/+16
PCM Midlevel,Timer Midlevel,ALSA Core - added SNDRV_TIMER_EVENT_SUSPEND / RESUME events - changed timer events from PAUSE / CONTINUE in PCM midlevel to SUSPEND / RESUME Signed-off-by: Jaroslav Kysela <perex@suse.cz>