aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-12-05Merge branches 'at91', 'ep93xx', 'etm', 'ks8695', 'nuc', 'u300' and 'u8500' ↵Russell King68-159/+5464
into devel
2009-12-04mac80211: fix reorder buffer releaseJohannes Berg1-1/+1
My patch "mac80211: correctly place aMPDU RX reorder code" uses an skb queue for MPDUs that were released from the buffer. I intentially didn't initialise and use the skb queue's spinlock, but in this place forgot that the code variant that doesn't touch the spinlock is needed. Thanks to Christian Lamparter for quickly spotting the bug in the backtrace Reinette reported. Reported-by: Reinette Chatre <[email protected]> Bug-identified-by: Christian Lamparter <[email protected]> Tested-by: Reinette Chatre <[email protected]> Signed-off-by: Johannes Berg <[email protected]> Signed-off-by: John W. Linville <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-04Merge branch 'master' of ↵David S. Miller88-2262/+3161
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
2009-12-04m68k: ptrace fixesAndreas Schwab2-17/+34
This fixes the following issues in ptrace: - when single stepping into the signal handler stop at the first insn of the handler - handle non-zero stkadj when accessing pc and sr in ptregs - correctly handle PT_SR in PTRACE_POKEUSR - report -EIO when trying to read unknown offset in PTRACE_PEEKUSR Additionally, the handling of the special case that PT_SR accesses a 16 bit word instead of a 32 bit word has been moved into get_reg/put_reg. Signed-off-by: Andreas Schwab <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2009-12-04m68k: use generic code for ptrace requestsAndreas Schwab2-54/+38
Remove all but PTRACE_{PEEK,POKE}USR and PTRACE_{GET,SET}{REGS,FPREGS} from arch_ptrace and let the rest be handled by generic code. Define PTRACE_SINGLEBLOCK to enable singleblock tracing. [Geert] Not yet applicable for m68knommu Signed-off-by: Andreas Schwab <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2009-12-04rtc: Add an RTC driver for the Ricoh RP5C01Geert Uytterhoeven3-0/+233
Signed-off-by: Geert Uytterhoeven <[email protected]> Acked-by: Alessandro Zummo <[email protected]>
2009-12-04rtc: Add an RTC driver for the Oki MSM6242Geert Uytterhoeven3-0/+279
Signed-off-by: Geert Uytterhoeven <[email protected]> Acked-by: Alessandro Zummo <[email protected]>
2009-12-04iwmc3200wifi: Enable wimax core through module parameterSamuel Ortiz1-2/+5
When debugging the wifi firmware, we need to disable the wimax core to gain some memory space. The default value will keep the wimax core enabled. Signed-off-by: Samuel Ortiz <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2009-12-04iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameterSamuel Ortiz3-6/+8
Wifi and wimax coexistence mode is set by wifi at boot time. There can be several modes, defined by priority tables. User space components can decide which one to select by writing to /sys/module/iwmc3200wifi/parameters/wiwi with this patch, before bringing the interface up. Signed-off-by: Samuel Ortiz <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2009-12-04iwmc3200wifi: Coex table command does not expect a responseSamuel Ortiz1-1/+1
When sending the wiwi coexistence priority table, we should not tell the LMAC that we want a response. Signed-off-by: Samuel Ortiz <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2009-12-04iwmc3200wifi: Update wiwi priority tableSamuel Ortiz1-4/+4
This update follows the firmware engineers recommendations. Signed-off-by: Samuel Ortiz <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2009-12-04iwlwifi: driver version track kernel versionReinette Chatre2-4/+4
The driver version number is a remnant from when there was an out-of-tree iwlwifi driver. Now that the driver forms part of kernel source we do not need a separate driver version. Instead, we now use the kernel version as driver version. We maintain the previous tags used to indicate which components the driver has been compiled with. Signed-off-by: Reinette Chatre <[email protected]> Acked-by: Wey-Yi Guy <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2009-12-04iwlwifi: indicate uCode type when fail dump error/event logWey-Yi Guy1-2/+6
error_event_table_ptr is only set upon receipt of REPLY_ALIVE. Until then both event log and error log will fail. Add information to indicate which uCode encounter the failure case. Signed-off-by: Wey-Yi Guy <[email protected]> Signed-off-by: Reinette Chatre <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2009-12-04iwl3945: remove duplicated event logging codeWey-Yi Guy1-9/+0
In the process of improving uCode event logging capability, the new implementation was introduced without removing the existing implementation. The event log will be dumped to dmesg twice. Remove the old implementation to only log the event once upon sys assert or request by user. Signed-off-by: Wey-Yi Guy <[email protected]> Signed-off-by: Reinette Chatre <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2009-12-04b43: fix two warningsJohannes Berg1-0/+1
My gcc appears to be able to see past the function boundary and notices that the variable 'behaviour' could be used uninitialised: drivers/net/wireless/b43/leds.c: In function ‘b43_leds_register’: drivers/net/wireless/b43/leds.c:339: warning: ‘behaviour’ may be used uninitialized in this function drivers/net/wireless/b43/leds.c: In function ‘b43_leds_init’: drivers/net/wireless/b43/leds.c:262: warning: ‘behaviour’ may be used uninitialized in this function because b43_led_get_sprominfo() didn't initialise it in all cases. Signed-off-by: Johannes Berg <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2009-12-04ipw2100: fix rebooting hang with driver loadedZhu Yi1-0/+11
Add PCI .shutdown method so that we can disable the device during shutdown or reboot. Without this, the reboot doesn't work well on some platforms. This fixes http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2124 Tested-by: pablo <[email protected]> Signed-off-by: Zhu Yi <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2009-12-04cfg80211: indent regulatory messages with spacesKalle Valo1-3/+3
The regulatory messages in syslog look weird: kernel: cfg80211: Regulatory domain: US kernel: ^I(start_freq - end_freq @ bandwidth), (max_antenna_gain, max_eirp) kernel: ^I(2402000 KHz - 2472000 KHz @ 40000 KHz), (600 mBi, 2700 mBm) kernel: ^I(5170000 KHz - 5190000 KHz @ 40000 KHz), (600 mBi, 2300 mBm) kernel: ^I(5190000 KHz - 5210000 KHz @ 40000 KHz), (600 mBi, 2300 mBm) kernel: ^I(5210000 KHz - 5230000 KHz @ 40000 KHz), (600 mBi, 2300 mBm) kernel: ^I(5230000 KHz - 5330000 KHz @ 40000 KHz), (600 mBi, 2300 mBm) kernel: ^I(5735000 KHz - 5835000 KHz @ 40000 KHz), (600 mBi, 3000 mBm) Indent them with four spaces instead of the tab character to get prettier output. Signed-off-by: Kalle Valo <[email protected]> Acked: Luis R. Rodriguez <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2009-12-04iwmc3200wifi: fix NULL pointer dereference in pmkid updateZhu Yi1-2/+4
When handling IWM_CMD_PMKID_FLUSH command, the bssid and pmkid in pmksa are all NULL. Check it before memcpy. Signed-off-by: Zhu Yi <[email protected]> Acked-by: Samuel Ortiz <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2009-12-04mac80211: Fix TX status reporting for injected data framesJouni Malinen1-1/+5
An earlier optimization on removing unnecessary traffic on cooked monitor interfaces ("mac80211: reduce the amount of unnecessary traffic on cooked monitor interfaces ") ended up removing quite a bit more than just unnecessary traffic. It was not supposed to remove TX status reporting for injected frames, but ended up doing it by checking the injected flag in skb->cb only after that field had been cleared with memset.. Fix this by taking a local copy of the injected flag before skb->cb is cleared. This broke user space applications that depend on getting TX status notifications for injected data frames. For example, STA inactivity poll from hostapd did not work and ended up kicking out stations even if they were still present. Signed-off-by: Jouni Malinen <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2009-12-04ath9k: enable 2GHz band only if the device supports itGabor Juhos3-14/+31
Currently, the 2GHz band is enabled unconditionally, even if the device does not support it. Changes-licensed-under: ISC Signed-off-by: Gabor Juhos <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2009-12-04airo: Fix integer overflow warningMichael Buesch1-1/+1
On BigEndian gcc complains: drivers/net/wireless/airo.c: In function ‘sniffing_mode’: drivers/net/wireless/airo.c:4809: warning: integer overflow in expression Fix this by doing the bitwise AND on the host-endian value. Signed-off-by: John W. Linville <[email protected]>
2009-12-04rt2x00: Fix padding bug on L2PAD devices.Gertjan van Wingerde1-1/+1
While reviewing the l2pad function to align both the header and the payload on a DMA-capable boundary a bug was discovered where the payload would not be properly aligned. The header_align value was used where the payload_align value should have been used. Signed-off-by: Gertjan van Wingerde <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2009-12-04WE: Fix set events not propagatedJean Tourrilhes1-1/+2
I've just noticed that some events are no longer propagated for some wireless drivers. Basically, SET request with a extra payload for driver without commit handler. The fix is pretty simple, see attached. Actually, a few lines below this line, you will see that the event generation for simple SET (iwpoint-less ?) is done properly, and this other event generation does not need fixing. Signed-off-by: Jean Tourrilhes <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2009-12-04b43legacy: avoid PPC fault during resumeLarry Finger1-0/+7
For PPC architecture with PHY Revision < 3, a read of the register B43_MMIO_HWENABLED_LO will cause a CPU fault unless b43legacy_status() returns a value of 2 (B43legacy_STAT_STARTED); however, one finds that the driver is unable to associate after resuming from hibernation unless this routine returns 1. To satisfy both conditions, the routine is rewritten to return TRUE whenever b43legacy_status() returns a value < 2. This patch fixes the second problem listed in the postings for Red Hat Bugzilla #538523. Signed-off-by: Larry Finger <[email protected]> Cc: Stable <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2009-12-04b43: avoid PPC fault during resumeLarry Finger1-2/+8
The routine b43_is_hw_radio_enabled() has long been a problem. For PPC architecture with PHY Revision < 3, a read of the register B43_MMIO_HWENABLED_LO will cause a CPU fault unless b43_status() returns a value of 2 (B43_STAT_STARTED) (BUG 14181). Fixing that results in Bug 14538 in which the driver is unable to reassociate after resuming from hibernation because b43_status() returns 0. The correct fix would be to determine why the status is 0; however, I have not yet found why that happens. The correct value is found for my device, which has PHY revision >= 3. Returning TRUE when the PHY revision < 3 and b43_status() returns 0 fixes the regression for 2.6.32. This patch fixes the problem in Red Hat Bugzilla #538523. Signed-off-by: Larry Finger <[email protected]> Tested-by: Christian Casteyde <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2009-12-04Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King18-39/+750
devel-stable
2009-12-04Merge branch 'devel' of ↵Russell King89-1081/+3068
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
2009-12-04Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stableRussell King141-1476/+5023
Conflicts: arch/arm/Kconfig
2009-12-04blkio: Allow CFQ group IO scheduling even when CFQ is a moduleVivek Goyal1-1/+1
o Now issues of blkio controller and CFQ in module mode should be fixed. Enable the cfq group scheduling support in module mode. Signed-off-by: Vivek Goyal <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2009-12-04blkio: Implement dynamic io controlling policy registrationVivek Goyal4-12/+69
o One of the goals of block IO controller is that it should be able to support mulitple io control policies, some of which be operational at higher level in storage hierarchy. o To begin with, we had one io controlling policy implemented by CFQ, and I hard coded the CFQ functions called by blkio. This created issues when CFQ is compiled as module. o This patch implements a basic dynamic io controlling policy registration functionality in blkio. This is similar to elevator functionality where ioschedulers register the functions dynamically. o Now in future, when more IO controlling policies are implemented, these can dynakically register with block IO controller. Signed-off-by: Vivek Goyal <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2009-12-04blkio: Export some symbols from blkio as its user CFQ can be a moduleVivek Goyal3-2/+27
o blkio controller is inside the kernel and cfq makes use of interfaces exported by blkio. CFQ can be a module too, hence export symbols used by CFQ. Signed-off-by: Vivek Goyal <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2009-12-04block: Fix io_context leak after failure of clone with CLONE_IOLouis Rilling4-9/+11
With CLONE_IO, parent's io_context->nr_tasks is incremented, but never decremented whenever copy_process() fails afterwards, which prevents exit_io_context() from calling IO schedulers exit functions. Give a task_struct to exit_io_context(), and call exit_io_context() instead of put_io_context() in copy_process() cleanup path. Signed-off-by: Louis Rilling <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2009-12-04block: Fix io_context leak after clone with CLONE_IOLouis Rilling1-1/+1
With CLONE_IO, copy_io() increments both ioc->refcount and ioc->nr_tasks. However exit_io_context() only decrements ioc->refcount if ioc->nr_tasks reaches 0. Always call put_io_context() in exit_io_context(). Signed-off-by: Louis Rilling <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2009-12-04Merge branch 'topic/hda' into for-linusTakashi Iwai48-2215/+9544
2009-12-04Merge branch 'topic/asoc' into for-linusTakashi Iwai154-2350/+8861
2009-12-04Merge branch 'topic/misc' into for-linusTakashi Iwai36-702/+1463
2009-12-04Merge branch 'topic/core-change' into for-linusTakashi Iwai590-7178/+10014
2009-12-04Merge branch 'pending-dma-streaming' (early part) into develRussell King6-21/+56
2009-12-04Merge branch 'pending-dma-coherent' into develRussell King6-326/+366
2009-12-04Merge branch 'pending-misc' (early part) into develRussell King1222-12597/+22150
2009-12-04ARM: I-cache: flush executable mappings in flush_cache_range()Russell King1-2/+1
Dirk Behme reported instability on ARM11 SMP (VIPT non-aliasing cache) caused by the dynamic linker changing protection on text pages to write GOT entries. The problem is due to an interaction between the write faulting code providing new anonymous pages which are incoherent with the I-cache due to write buffering, and the I-cache not having been invalidated. a4db94d plugs the hole with the data cache coherency. This patch provides the other half of the fix by flushing the I-cache in flush_cache_range() for VM_EXEC VMAs (which is what we have when the region is being made executable again.) This ensures that the I-cache will be up to date with the newly COW'd pages. Note: if users are writing instructions, then they still need to use the ARM sys_cacheflush API to ensure that the caches are correctly synchronized. Signed-off-by: Russell King <[email protected]>
2009-12-04ARM: I-cache: avoid flushing in flush_cache_mm()Russell King1-1/+0
flush_cache_mm() is called in two cases: 1. when a process exits, just before the page tables are torn down. We can allow the stale lines to evict themselves over time without causing any harm. 2. when a process forks, and we've allocated a new ASID. The instruction cache issues are dealt with as pages are brought into the new process address space. Flushing the I-cache here is therefore unnecessary. However, we must keep the VIPT aliasing D-cache flush to ensure that any dirty cache lines are not written back after the pages have been reallocated for some other use - which would result in corruption. Signed-off-by: Russell King <[email protected]>
2009-12-04ARM: I-cache: Add invalidation for VIVT ASID tagged cachesRussell King1-0/+6
Signed-off-by: Russell King <[email protected]>
2009-12-04ARM: 5794/1: Flush the D-cache during copy_user_highpage()Catalin Marinas1-0/+8
The I and D caches for copy-on-write pages on processors with write-allocate caches become incoherent causing problems on application relying on CoW for text pages (dynamic linker relocating symbols in a text page). This patch flushes the D-cache for such pages. Cc: Nicolas Pitre <[email protected]> Signed-off-by: Catalin Marinas <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-12-04ARM: Remove __flush_icache_all() from __flush_dcache_page()Russell King1-3/+1
Both call sites for __flush_dcache_page() end up calling __flush_icache_all() themselves, so having __flush_dcache_page() do this as well is wasteful. Remove the duplicated icache flushing. Signed-off-by: Russell King <[email protected]>
2009-12-04ARM: Move __flush_icache_all() out of flush_pfn_alias()Russell King1-3/+8
Signed-off-by: Russell King <[email protected]>
2009-12-04ARM: Reduce __flush_dcache_page() visibilityRussell King3-2/+4
Signed-off-by: Russell King <[email protected]>
2009-12-04[WATCHDOG] iTCO_wdt.c - cleanup chipset documentationWim Van Sebroeck1-44/+17
Cleanup the documentation about the supported chipsets. Signed-off-by: Wim Van Sebroeck <[email protected]>
2009-12-04[WATCHDOG] iTCO_wdt: Add support for Intel Ibex PeakSeth Heasley1-1/+12
Add the Intel Ibex Peak (PCH) Device IDs to iTCO_wdt.c. Signed-off-by: Seth Heasley <[email protected]> Signed-off-by: Wim Van Sebroeck <[email protected]>
2009-12-04[WATCHDOG] CPUFREQ: S3C24XX Watchdog frequency scaling support.Ben Dooks1-3/+86
Add support for CPU frequency scaling to the S3C24XX Watchdog driver. Signed-off-by: Simtec Linux Team <[email protected]> Signed-off-by: Ben Dooks <[email protected]> Signed-off-by: Wim Van Sebroeck <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.