summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream' of ↵Jeff Garzik2007-02-099-94/+210
|\ | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
| * [PATCH] ieee80211: Fix sparse warningLarry Finger2007-02-091-3/+0
| | | | | | | | | | | | | | | | Sparse issues the warning "warning: symbol 'crypt' shadows an earlier one" in net/ieee80211/ieee80211_tx.c. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] bcm43xx: Check error returns in initialization routinesLarry Finger2007-02-091-5/+14
| | | | | | | | | | | | | | | | A number of the calls in the initialization routines fail to check the returned value for errors. This patch adds the necessary checks and logs any errors found when appropriate. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] Replace incorrect macro name "WIRELESS_EXT" with "CONFIG_WIRELESS_EXT"Robert P. J. Day2007-02-091-2/+2
| | | | | | | | | | | | | | | | | | Rename the (apparently) incorrect macro name WIRELESS_EXT to CONFIG_WIRELESS_EXT. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] Rename IPW2100 debugging macros to not look like config options.Robert P. J. Day2007-02-071-8/+8
| | | | | | | | | | | | | | | | Rename some internal ipw2100 debugging macros to not look like user-settable kernel config settings. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] zd1211rw: Remove noisy debug messageDaniel Drake2007-02-071-2/+0
| | | | | | | | | | | | | | | | This causes a lot of uninteresting output in noisy environments, and doesn't really serve any purpose. Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] zd1211rw: Added error stats updateUlrich Kunitz2007-02-072-5/+41
| | | | | | | | | | | | | | | | | | | | Added update of network device error statistics. Based on earlier work by Maxime Austruy. Signed-off-by: Ulrich Kunitz <kune@deine-taler.de> Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] zd1211rw: Fixed array size issue in reset_modeUlrich Kunitz2007-02-071-3/+2
| | | | | | | | | | | | | | Andy Green found this issue. Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] zd1211rw: Reset device in the probe callUlrich Kunitz2007-02-071-0/+2
| | | | | | | | | | | | | | | | | | | | This resets the device in the probe call. It does work with 2.6.19.2 including the softmac patches. It might fix the reboot/reset problems a lot of people reported. Signed-off-by: Ulrich Kunitz <kune@deine-taler.de> Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] bcm43xx: Enable fwpostfix in nondebug bcm43xxMichael Buesch2007-02-071-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The in-kernel bcm43xx driver only works with V3 firmware, whereas the experimental version that incorporates the d80211 stack requires V4 firmware. In bcm43xx-d80211, the fwpostfix module parameter is used to differentiate between the versions. In bcm43xx-softmac, this module parameter is only enabled when debugging is on. This patch makes the module parameter available unconditionaly, and should ease the future transition from softmac to d80211. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] bcm43xx: Fix scaling error for 'iwlist freq' informationLarry Finger2007-02-071-2/+2
| | | | | | | | | | | | | | | | The bcm43xx driver returns the available frequencies to 'iwlist freq' with the wrong scaling. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] bcm43xx: Fix scaling error for 'iwlist rate' informationLarry Finger2007-02-071-12/+12
| | | | | | | | | | | | | | | | The bcm43xx scales the rate information supplied to a WE iwlist rate call incorrectly. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] bcm43xx: Fix problem with >1 GB RAMLarry Finger2007-02-072-47/+125
| | | | | | | | | | | | | | | | | | | | | | | | Some versions of the bcm43xx chips only support 30-bit DMA, which means that the descriptors and buffers must be in the first 1 GB of RAM. On the i386 and x86_64 architectures with more than 1 GB RAM, an incorrect assignment may occur. This patch ensures that the various DMA addresses are within the capability of the chip. Testing has been limited to x86_64 as no one has an i386 system with more than 1 GB RAM. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] zd1211rw: fix potential leak in usb_initMaxime Austruy2007-02-071-0/+1
| | | | | | | | | | | | | | | | | | usb_init should call destroy_workqueue when usb_register fails. Signed-off-by: Maxime Austruy <maxime@tralhalla.org> Signed-off-by: Ulrich Kunitz <kune@deine-taler.de> Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
* | NetXen: Updates for ethtool supportAmit S. Kale2007-02-093-4/+14
| | | | | | | | | | | | | | NetXen: Updates for ethtool support. Signed-off-by: Amit S. Kale <amitkale@netxen.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | NetXen: Fixes for ppc architecture.Amit S. Kale2007-02-094-4/+7
| | | | | | | | | | | | | | NetXen: Fixes for ppc architecture. Signed-off-by: Amit S. Kale <amitkale@netxen.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | ehea: Fixed error recoveryJan-Bernd Themann2007-02-096-2/+68
| | | | | | | | | | | | | | Error recovery for QP errors: Reset QPs and dump error information Signed-off-by: Jan-Bernd Themann <themann@de.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | [PATCH] m68knommu: use irq_handler_t for passing handler typesGreg Ungerer2007-02-0912-12/+14
| | | | | | | | | | | | | | Use irq_handler_t for passing clock handler routine around. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | [PATCH] m68knommu: removed include of system.h from bitopsGreg Ungerer2007-02-091-1/+0
| | | | | | | | | | | | | | Remove include of asm/system.h, not needed. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | [PATCH] uclinux: correctly remap bin_fmtflat exe allocated mem regionsGreg Ungerer2007-02-091-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remap() the region we get from mmap() to mark the fact that we are using all of the available slack space. Any slack space is used to form a simple brk region, and potentially more stack space than requested at load time. Any searches of the vma chain may well fail looking for stack (and especially arg) addresses if the remaping is not done. The simplest example is /proc/<pid>/cmdline, since the args are pretty much always at the top of the data/bss/stack region. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | [PATCH] m68knommu: use irq_handler_t passing handler to clock initGreg Ungerer2007-02-091-2/+3
| | | | | | | | | | | | | | | | Use irq_handler_t for passing interrupt handler around. Fix optional profiler handler to return a irq_return_t type. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | [PATCH] m68knommu: use irq_handler_t passing handler to PIT initGreg Ungerer2007-02-091-1/+1
| | | | | | | | | | | | | | Use irq_handler_t type for passing timer handler to timer init code. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | [PATCH] m68knommu: include unused sections in linker scriptGreg Ungerer2007-02-091-0/+10
| | | | | | | | | | | | | | | | Include the unused sections in the m68knommu linker scripts. Needed for modules support. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | [PATCH] m68knommu: remove regs arg from coldfire timer interruptGreg Ungerer2007-02-091-2/+3
| | | | | | | | | | | | | | Fix coldfire kernel timer to remove regs arg. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | Merge branch 'for-linus' of ↵Linus Torvalds2007-02-0918-7280/+105
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: fix host device registering when nodemgr disabled ieee1394: video1394: DMA fix ieee1394: raw1394: prevent unloading of low-level driver ieee1394: dv1394: tidy up card removal ieee1394: dv1394: fix CardBus card ejection ieee1394: sbp2: lower block queue alignment requirement ieee1394: sbp2: remove bogus "emulated" host flag ieee1394: save one word in struct hpsb_host ieee1394: restore config ROM when resuming ieee1394: ohci1394: drop pcmcia-cs compatibility code ieee1394: nodemgr: check info_length in ROM header earlier the scheduled IEEE1394_OUI_DB removal the scheduled IEEE1394_EXPORT_FULL_API removal ieee1394: sbp2: use a better wildcard for blacklist Add PCI class ID for firewire OHCI controllers. ieee1394: modified csr1212_key_id_type_map to support lisight
| * | ieee1394: fix host device registering when nodemgr disabledStefan Richter2007-02-081-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since my commit 8252bbb1363b7fe963a3eb6f8a36da619a6f5a65 in 2.6.20-rc1, host devices have a dummy driver attached. Alas the driver was not registered before use if ieee1394 was loaded with disable_nodemgr=1. This resulted in non-functional FireWire drivers or kernel lockup. http://bugzilla.kernel.org/show_bug.cgi?id=7942 Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| * | ieee1394: video1394: DMA fixDavid Moore2007-02-081-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This together with the phys_to_virt fix in lib/swiotlb.c::swiotlb_sync_sg fixes video1394 DMA on machines with DMA bounce buffers, especially Intel x86-64 machines with > 3GB RAM. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: David Moore <dcm@acm.org> Tested-by: Nicolas Turro <Nicolas.Turro@inrialpes.fr>
| * | ieee1394: raw1394: prevent unloading of low-level driverStefan Richter2007-02-081-19/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unloading the low-level driver module of a FireWire host can lead to all sorts of trouble if a raw1394 userspace client is using the host. Just disallow it by incrementing the LLD's module reference count on a RAW1394_REQ_SET_CARD write operation. Decrement it when the file is closed. This feature wouldn't be relevant if "modprobe -r video1394" or "modprobe -r dv1394" didn't automatically unload ohci1394 too. http://bugzilla.kernel.org/show_bug.cgi?id=7701 Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Dan Dennedy <dan@dennedy.org>
| * | ieee1394: dv1394: tidy up card removalStefan Richter2007-02-081-23/+13
| | | | | | | | | | | | | | | | | | small coding style touch-up and terser coding Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| * | ieee1394: dv1394: fix CardBus card ejectionStefan Richter2007-02-081-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fix NULL pointer dereference on hot ejection of a FireWire card while dv1394 was loaded. http://bugzilla.kernel.org/show_bug.cgi?id=7121 I did not test card ejection with open /dev/dv1394 files yet. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| * | ieee1394: sbp2: lower block queue alignment requirementStefan Richter2007-02-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old setting is copy & waste from usb-storage and doesn't apply to sbp2. There is only 4-byte alignment required for everything, except for S/G table elements which have to be 8-byte aligned according to the SBP-2 spec. (They happen to be ____cacheline_aligned in our implementation. Whether that's good is another question.) We now simply don't tune block queue alignment at all. The default alignment would surely never become anything else than a multiple of 4, else tons of calls to blk_queue_dma_alignment would have to be added everywhere in drivers/... Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| * | ieee1394: sbp2: remove bogus "emulated" host flagStefan Richter2007-02-081-1/+0
| | | | | | | | | | | | | | | | | | There is no emulation going on here. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| * | ieee1394: save one word in struct hpsb_hostStefan Richter2007-02-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | hpsb_host.config_roms is a bitfield of which only one bit is currently used. hpsb_host.update_config_rom is only a Boolean. Neither one is accessed in hot code paths or with alignment requirements. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| * | ieee1394: restore config ROM when resumingStefan Richter2007-02-084-9/+12
| | | | | | | | | | | | | | | | | | | | | After PM suspend + resume, the local configuration ROM was not restored. This prevented remote nodes from recognizing the resuming machine. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| * | ieee1394: ohci1394: drop pcmcia-cs compatibility codeStefan Richter2007-02-081-7/+2
| | | | | | | | | | | | | | | | | | #ifdef PCMCIA is only true if compiled inside pcmcia-cs, isn't it? Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| * | ieee1394: nodemgr: check info_length in ROM header earlierStefan Richter2007-02-081-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The whole ROM area which is covered by the crc_length field of the ROM header was fetched before the info_length field was checked for correct general ROM format. This might be wasteful or even dangerous with nodes with minimal ROM, nonstandard ROM, or corrupt ROM. Perform this check at the earliest opportunity. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| * | the scheduled IEEE1394_OUI_DB removalAdrian Bunk2007-02-088-7145/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch contains the scheduled IEEE1394_OUI_DB removal. Signed-off-by: Adrian Bunk <bunk@stusta.de> Update: Also remove drivers/ieee1394/.gitignore. Remove now unused struct members in drivers/ieee1394/nodemgr.h. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| * | the scheduled IEEE1394_EXPORT_FULL_API removalAdrian Bunk2007-02-083-37/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch contains the scheduled IEEE1394_EXPORT_FULL_API removal. Signed-off-by: Adrian Bunk <bunk@stusta.de> Update: Pull proper portion of feature-removal-schedule.txt. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| * | ieee1394: sbp2: use a better wildcard for blacklistStefan Richter2007-02-081-12/+8
| | | | | | | | | | | | | | | | | | | | | 0x000000 could be a valid value to match against, but anything bigger than 0xffffff cannot. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| * | Add PCI class ID for firewire OHCI controllers.Kristian Høgsberg2007-02-082-3/+2
| | | | | | | | | | | | | | | | | | | | | Pull this define out of drivers/ieee1394/ohci1394.c and rename to match other PCI class defines. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| * | ieee1394: modified csr1212_key_id_type_map to support lisightAndrea Guzzo2007-02-081-3/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | This patch applies a little change in csr1212.c to fix iSight (firewire digital camera) related issues (but maybe other firewire devices could also need such modification) The actual implementation of the "csr1212_key_id_type_map" table doesn't support some node types used by the iSight for the audio unit. This limit makes the csr scanning routine to never see the audio unit node , and consequently the iSight driver probe() routine to be never called and there is no way to hook an isight device when it is inserted. Signed-off-by: Andrea Guzzo <xant@xant.net> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
* | [PATCH] kbuild: more Makefile cleanupsRoman Zippel2007-02-091-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the remaining changes which should have been part of the review process. - the define command is inappropriate (it's primarily for rule definitions) - execute commands in the current dir as all other commands - .*.tmp (but not .*.null) files are also removed up by "make clean" - printf has other side effects, just use "echo -e" - proper quoting - proper indentation Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-apmLinus Torvalds2007-02-0919-1370/+80
|\ \ | | | | | | | | | | | | | | | | | | | | | * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-apm: [APM] SH: Convert to use shared APM emulation. [APM] MIPS: Convert to use shared APM emulation. [APM] ARM: Convert to use shared APM emulation. [APM] Add shared version of APM emulation
| * | [APM] SH: Convert to use shared APM emulation.Paul Mundt2007-02-095-632/+28
| | | | | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | [APM] MIPS: Convert to use shared APM emulation.Ralf Baechle2007-02-094-699/+9
| | | | | | | | | | | | | | | | | | | | | Also convert to use generic kernel/power/Kconfig to make the use of the shared APM emulation possible. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | [APM] ARM: Convert to use shared APM emulation.Ralf Baechle2007-02-098-766/+8
| | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | [APM] Add shared version of APM emulationRalf Baechle2007-02-094-0/+762
| | | | | | | | | | | | | | | | | | | | | | | | Currently ARM and MIPS both have nearly identical copies of the APM emulation code in their arch code. Add yet another copy of it to drivers char and make it selectable through SYS_SUPPORTS_APM_EMULATION. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* | | [PATCH] SH vdso: use install_special_mapping()Paul Mundt2007-02-091-49/+9
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org> Cc: Roland McGrath <roland@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | | [PATCH] powerpc vDSO: use install_special_mappingRoland McGrath2007-02-091-77/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uses install_special_mapping for the powerpc vDSO setup, consolidating duplicated code. Signed-off-by: Roland McGrath <roland@redhat.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | | [PATCH] x86_64 ia32 vDSO: use install_special_mappingRoland McGrath2007-02-092-47/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uses install_special_mapping for the ia32 vDSO setup, consolidating duplicated code. Signed-off-by: Roland McGrath <roland@redhat.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
OpenPOWER on IntegriCloud