aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [MMC] Use __devexit_p in wbsdPierre Ossman2005-11-09
| | | | | | | | wbsd_*_remove() is declared as __devexit but __devexit_p isn't used when taking their addresses. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-11-09
|\
| * [ARM] 3057/1: Add memory control method to support OneNAND sync burst readKyungmin Park2005-11-09
| | | | | | | | | | | | | | | | | | Patch from Kyungmin Park This patch is required for OneNAND MTD to passing the OneNAND sync. burst read Signed-off-by: Kyungmin Park Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] Clean up save_and_disable_irqs macro and allow use of ARMv6 CPSIDRussell King2005-11-09
| | | | | | | | | | | | | | | | | | save_and_disable_irqs does not need to use mov + msr (which was introduced to work around a documentation bug which was propagated into binutils.) Use msr with an immediate constant, and if we're building for ARMv6 or later, use the new CPSID instruction. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * Merge with ARM SMP treeRussell King2005-11-09
| |\
| | * [ARM SMP] Add CPU hotplug support for Realview MPcoreRussell King2005-11-09
| | | | | | | | | | | | | | | | | | | | | Add platform specific parts for hotplug CPU support for the Realview board. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [ARM SMP] Add local timer support for Realview MPcoreRussell King2005-11-09
| | | | | | | | | | | | | | | | | | | | | Add platform specific parts for local timer support for the Realview board. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 3100/1: simplify a pointer computationNicolas Pitre2005-11-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Nicolas Pitre Looks clearer this way. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 3138/1: SMDK2440 - fix map_desc initialisation (and ISA memory space)Ben Dooks2005-11-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Ben Dooks Fix the map_desc initialisers for the SMDK2440 machine to use the new .pfn method, and at the same time making the differntiation between ISA IO and Memory space accesses Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 3137/1: RX3715 - fix map_desc initialiserBen Dooks2005-11-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Ben Dooks Change the initialiser for the map_desc for the iPAQ RX3715 to use the new pfn initialiser, and also reduce the amount of ISA space mapped (we only need to stop any ISA IO writes OOPsing the system, so do not need >1Mbyte of space) Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 3136/1: Anubis - fix map_desc initialisersBen Dooks2005-11-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Ben Dooks Fix the map_desc initialisers for the Simtec Anubis board to match the new initialiser scheme. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge branch 'upstream-linus' of ↵Linus Torvalds2005-11-09
|\ \ \ | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| * | | [PATCH] libata: if condition fix for ata_dev_identify()Albert Lee2005-11-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - if condition fix for ata_dev_identify() - ata_pio_poll() minor cleanup. Changes: - Use (dev->class == ATA_DEV_ATA) for ata_dev_identify() since "qc->tf.command" has been overwritten by the device status - Use HSM_ST_TMOUT directly in ata_pio_poll() Signed-off-by: Albert Lee <albertcc@tw.ibm.com> ============ Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | [PATCH] libata kernel-doc fixesRandy Dunlap2005-11-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix all reported kernel-doc errors in libata. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | Merge branch 'master'Jeff Garzik2005-11-09
| |\| |
| * | | [libata] eliminate use of drivers/scsi/scsi.h compatibility header/definesJeff Garzik2005-11-07
| | | |
* | | | Merge branch 'upstream-linus' of ↵Linus Torvalds2005-11-09
|\ \ \ \ | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| * | | | [PATCH] IOC: And don't mark the things as broken Cowboy.Ralf Baechle2005-11-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And don't mark the things as broken Cowboy. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | [PATCH] dgrs: fix warnings when CONFIG_ISA and CONFIG_PCI are not enabledAshutosh Naik2005-11-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes compiler warnings when CONFIG_ISA and CONFIG_PCI are not enabled in the dgrc network driver. Signed-off-by: Ashutosh Naik <ashutosh.naik@gmail.com> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | [PATCH] uml_net: use ethtool_opsChristoph Hellwig2005-11-09
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | [PATCH] xtensa platform-iss network: remove no-op ioctl handlerChristoph Hellwig2005-11-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the driver ever wants to add ethtool support it should use ethtool_ops. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | [PATCH] cris v10 eth: use ethtool_opsChristoph Hellwig2005-11-09
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | [PATCH] b44: increase version numberFrancois Romieu2005-11-09
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | [PATCH] b44: race on device closingFrancois Romieu2005-11-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usual fix: - b44_interrupt() does not schedule NAPI polling when the device is going down; - b44_close() waits for any scheduled NAPI polling before it starts to release the private structures of the device. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | [PATCH] b44: replace B44_FLAG_INIT_COMPLETE with netif_running()Francois Romieu2005-11-09
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | ieee80211: cleanup crypto list handling, other minor cleanups.Christoph Hellwig2005-11-09
| | | | |
| * | | | [wireless ipw2100] kill unused-var warnings for debug-disabled codeJeff Garzik2005-11-09
| | | | |
| * | | | Merge rsync://bughost.org/repos/ipw-delta/Jeff Garzik2005-11-09
| |\ \ \ \
| | * | | | Updated READMEs and MAINTAINERS for the ipw2100 and ipw2200 drivers.James Ketrenos2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | * | | | Update version ipw2200 stamp to 1.0.8James Ketrenos2005-11-07
| | | | | |
| | * | | | Updated firmware version stamp to 2.4 from 2.3 so it will use the latest ↵James Ketrenos2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | firmware. You can obtain the firmware at http://ipw2200.sf.net/firmware.php Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | * | | | Fixed parameter reordering in firmware log routine.James Ketrenos2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | * | | | Fixed problem with not being able to send broadcast packets.Hong Liu2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | * | | | Added channel support for ipw2200 cards identified as 'ZZR'James Ketrenos2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | * | | | Removed warning about TKIP not being configured if countermeasures areJames Ketrenos2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configured. Countermeasures default to being turned off when wpa_supplicant runs, regardless of if TKIP is being used. They are only turned on if a TKIP is running. The warning we were printing is therefore not needed. Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | * | | | Fixes missed beacon logic in relation to on-network AP roaming.Ben Cahill2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | * | | | Removed legacy WIRELESS_EXT checks from ipw2200.cJames Ketrenos2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | * | | | Fix 'Driver using old /proc/net/wireless support, please fix driver !' message.Benoit Boissinot2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wireless extensions moved the get_wireless_stats handler from being in net_device into wireless_handler. Signed-off-by: Benoit Boissinot <benoit.boissinot@ens-lyon.org> Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | * | | | Pulled out a stray KERNEL_VERSION check around the suspend handler.James Ketrenos2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | * | | | Updated driver version stamps for ipw2100 (1.1.3) and ipw2200 (1.0.7)James Ketrenos2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | * | | | Fixes WEP firmware error condition.Hong Liu2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is caused by the patch in bug455 -- Channel change flood generates fatal error. The patch set the DISASSOCIATING status bit after sending the command. The process was scheduled out when waiting for the command to be sent to the card. The disassociated notification clears the DISASSOCIATING bit in the tasklet before the process set the bit. Move the bit setting code before sending the command now. Signed-off-by: Hong Liu <hong.liu@intel.com> Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | * | | | [Fix bug# 771] Too many (8) bytes recieved when using AES/hwcryptoZhu Yi2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | * | | | Fixes problem with WEP not working (association succeeds, but no Tx/Rx)Hong Liu2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | * | | | Removed PF_SYNCTHREAD legacy.James Ketrenos2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PF_SYNCTHREAD check was introduced to try and remain compatible with SWSUSP2. This check is no longer needed with newer versions. Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | * | | | Fixed problem with get_cmd_string not existing if CONFIG_IPW_DEBUG disabled.James Ketrenos2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | * | | | Card with WEP enabled and using shared-key auth will have firmwareHong Liu2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error when it tries to auth to a WPA ap. The patch filters out WPA networks if the card is not wpa enabled when selecting network to associate to. Signed-off-by: Hong Liu <hong.liu@intel.com>
| | * | | | Mixed PTK/GTK CCMP/TKIP support.Hong Liu2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hong Liu <hong.liu@intel.com>
| | * | | | Fixed is_network_packet() to include checking for broadcast packets.Peter Jones2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | * | | | Adds radiotap support to ipw2200 in monitor mode..Mike Kershaw2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike Kershaw <dragorn@kismetwireless.net> Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| | * | | | Make all the places the firmware fails to load showerrors (in decimal,Peter Jones2005-11-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so you can cross-reference errno.h easily). Signed-off-by: Peter Jones <pjones@redhat.com> Signed-off-by: James Ketrenos <jketreno@linux.intel.com>