aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-05-19ath9k_htc: Fix mode selectionSujith Manoharan3-11/+6
Remove all the unsupported modes like FH, TURBO etc. Since this requires a FW update, increase the fw version to 1.3 Signed-off-by: Sujith Manoharan <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-05-19iwlwifi: remove unused parameter from iwl_hcmd_queue_reclaimDaniel Halperin1-3/+2
cmd_index is never used. Signed-off-by: Daniel Halperin <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-05-19mwifiex: adjust high/low water marks for tx_pending queueMarc Yang2-2/+5
This is to fix an issue that the throughput of the higher priority stream gets dropped when a lower priority stream is present. Signed-off-by: Marc Yang <[email protected]> Signed-off-by: Bing Zhao <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-05-19mwifiex: CPU mips optimization with NO_PKT_PRIO_TIDMarc Yang2-0/+7
If we go through the entire for loop in mwifiex_wmm_get_highest_priolist_ptr() and don't find any packets, set highest_queued_prio to NO_PKT_PRIO_TID (< LOW_PRIO_TID). Signed-off-by: Marc Yang <[email protected]> Signed-off-by: Bing Zhao <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-05-19mwifiex: check mwifiex_wmm_lists_empty() before dequeueMarc Yang1-1/+1
add checks to mwifiex_wmm_process_tx() loop so it doesn't re-enter mwifiex_dequeue_tx_packet() to find it can't send. Signed-off-by: Marc Yang <[email protected]> Signed-off-by: Bing Zhao <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-05-19mwifiex: reduce CPU usage by tracking highest_queued_prioMarc Yang2-3/+28
This patch adds highest_queued_prio to track priority of packets as they are enqueued so that mwifiex_wmm_get_highest_priolist_ptr() starts checking at the first level where we have packets, instead of the highest. The function also lowers priority value to the level where first packet is found. Signed-off-by: Marc Yang <[email protected]> Signed-off-by: Bing Zhao <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-05-19mwifiex: reduce CPU usage by tracking tx_pkts_queuedMarc Yang3-10/+19
This patch adds tx_pkts_queued to track number of packets being enqueued & dequeued so that mwifiex_wmm_lists_empty() evaluation is lightweight. Signed-off-by: Marc Yang <[email protected]> Signed-off-by: Bing Zhao <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-05-19net: rfkill: add generic gpio rfkill driverRhyland Klein4-0/+280
This adds a new generic gpio rfkill driver to support rfkill switches which are controlled by gpios. The driver also supports passing in data about the clock for the radio, so that when rfkill is blocking, it can disable the clock. This driver assumes platform data is passed from the board files to configure it for specific devices. Original-patch-by: Anantha Idapalapati <[email protected]> Signed-off-by: Rhyland Klein <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-05-19ath9k: fix ad-hoc mode beacon selectionFelix Fietkau1-12/+20
In ad-hoc mode, beacon timers are configured differently compared to AP mode, and (depending on the scenario) can vary enough to make the beacon tasklet not detect slot 0 based on the TSF. Since staggered beacons are not (and cannot be) used in ad-hoc mode, it makes more sense to just hardcode slot 0 here, avoiding unnecessary TSF reads and calculations. Signed-off-by: Felix Fietkau <[email protected]> Reported-by: Rajkumar Manoharan <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-05-19Merge branch 'tip/perf/core' of ↵Ingo Molnar11-145/+1116
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
2011-05-19Merge branch 'tip/perf/core-3' of ↵Ingo Molnar1-2/+5
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
2011-05-19kmemleak: Initialise kmemleak after debug_objects_mem_init()Catalin Marinas1-1/+1
Kmemleak frees objects via RCU and when CONFIG_DEBUG_OBJECTS_RCU_HEAD is enabled, the RCU callback triggers a call to free_object() in lib/debugobjects.c. Since kmemleak is initialised before debug objects initialisation, it may result in a kernel panic during booting. This patch moves the kmemleak_init() call after debug_objects_mem_init(). Reported-by: Marcin Slusarz <[email protected]> Tested-by: Tejun Heo <[email protected]> Signed-off-by: Catalin Marinas <[email protected]> Cc: <[email protected]>
2011-05-19kmemleak: Select DEBUG_FS unconditionally in DEBUG_KMEMLEAKCatalin Marinas1-1/+1
In the past DEBUG_FS used to depend on SYSFS and DEBUG_KMEMLEAK selected it conditionally. This is no longer the case, so always select DEBUG_FS via DEBUG_KMEMLEAK. Signed-off-by: Catalin Marinas <[email protected]>
2011-05-19kmemleak: Do not return a pointer to an object that kmemleak did not getCatalin Marinas1-2/+5
The kmemleak_seq_next() function tries to get an object (and increment its use count) before returning it. If it could not get the last object during list traversal (because it may have been freed), the function should return NULL rather than a pointer to such object that it did not get. Signed-off-by: Catalin Marinas <[email protected]> Reported-by: Phil Carmody <[email protected]> Acked-by: Phil Carmody <[email protected]> Cc: <[email protected]>
2011-05-19ALSA: hda - Enable Realtek ALC269 codec input layer beepMadis Janson1-0/+1
This fixes the input layer beep not working on some EeePC 1000 models by adding the subsystem id into whitelist. Otherwise the corresponding ALSA mixer is not enabled and stays muted, resulting in no console beep. Signed-off-by: Madis Janson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-05-19input/atari: Fix mouse movement and button mappingGeert Uytterhoeven1-4/+4
Up and down movements were reversed, left and right buttons were swapped. Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-05-19input/atari: Fix atarimouse initMichael Schmitz2-4/+6
Atarimouse fails to load as a module (with ENODEV), due to a brown paper bag bug, misinterpreting the semantics of atari_keyb_init(). [geert] Propagate the return value of atari_keyb_init() everywhere Signed-off-by: Michael Schmitz <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-05-19input/atari: Use the correct mouse interrupt hookMichael Schmitz3-8/+3
The Atari keyboard driver calls atari_mouse_interrupt_hook if it's set, not atari_input_mouse_interrupt_hook. Fix below. [geert] Killed off atari_mouse_interrupt_hook completely, after fixing another incorrect assignment in atarimouse.c. Signed-off-by: Michael Schmitz <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-05-19m68k/atari: Do not use "/" in interrupt namesGeert Uytterhoeven4-4/+4
It may trigger a warning in fs/proc/generic.c:__xlate_proc_name() when trying to add an entry for the interrupt handler to sysfs. Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-05-19m68k: unistd - Comment out definitions for unimplemented syscallsGeert Uytterhoeven1-22/+24
Suggested-by: Arnd Bergmann <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-05-19m68k: Really wire up sys_pselect6 and sys_ppollGeert Uytterhoeven1-2/+2
We reserved the numbers a long time ago, but never wired them up in the syscall table as they need TIF_RESTORE_SIGMASK, which we only got last year in commit cb6831d5d3099e772a510eb3e1ed0760ccffb45e ("m68k: Switch to saner sigsuspend()") Signed-off-by: Geert Uytterhoeven <[email protected]> Acked-by: Greg Ungerer <[email protected]> Cc: [email protected]
2011-05-19m68k: Merge mmu and non-mmu versions of sys_call_tableGeert Uytterhoeven3-445/+96
Impact for nommu: - Store table in .rodata instead of .text, - Let kernel/sys_ni.c handle the stubbing of MMU-only syscalls, - Implement sys_mremap and sys_nfsservct, - Remove unused padding at the end of the table. Impact for mmu: - Store table in .rodata instead of .data. Signed-off-by: Geert Uytterhoeven <[email protected]> Acked-by: Greg Ungerer <[email protected]>
2011-05-19MAINTAINERS: Roman Zippel has been MIA for several years.Geert Uytterhoeven1-5/+4
Hence make AFFS and HFS orphans, and remove him as an m68k maintainer. Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-05-19m68k: bitops - Never step beyond the end of the bitmapGeert Uytterhoeven1-26/+55
find_next bitops on m68k (find_next_zero_bit, find_next_bit, and find_next_bit_le) may cause out of bounds memory access when the bitmap size in bits % 32 != 0 and offset (the bitnumber to start searching at) is very close to the bitmap size. For example, unsigned long bitmap[2] = { 0, 0 }; find_next_bit(bitmap, 63, 62); 1. find_next_bit() tries to find any set bits in bitmap[1], but no bits set. 2. Then find_first_bit(bimap + 2, -1) 3. Unfortunately find_first_bit() takes unsigned int as the size argument. 4. find_first_bit will access bitmap[2~] until it find any set bits. Add missing tests for stepping beyond the end of the bitmap to all find_{first,next}_*() functions, and make sure they never return a value larger than the bitmap size. Reported-by: Akinobu Mita <[email protected]> Cc: Andreas Schwab <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-05-19m68k: bitops - offset == ((long)p - (long)vaddr) * 8Geert Uytterhoeven1-4/+2
Hence use "offset" in find_next_{,zero_}bit(), like is already done for find_next_{,zero_}bit_le() Signed-off-by: Geert Uytterhoeven <[email protected]> Cc: Akinobu Mita <[email protected]> Cc: Andreas Schwab <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-05-19ALSA: intel8x0m: enable AMD8111 modemDmitry Eremin-Solenikov1-2/+2
AMD 8111 southbridges contain a controller for MC'97 modem. Enable support for this controller in intel8x0m driver. Signed-off-by: Dmitry Eremin-Solenikov <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-05-19drivers/xen/sys-hypervisor: Cleanup code/data sections definitionsDaniel Kiper1-1/+1
Cleanup code/data sections definitions accordingly to include/linux/init.h. Signed-off-by: Daniel Kiper <[email protected]> Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
2011-05-19arch/x86/xen/smp: Cleanup code/data sections definitionsDaniel Kiper1-4/+4
Cleanup code/data sections definitions accordingly to include/linux/init.h. Signed-off-by: Daniel Kiper <[email protected]> Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
2011-05-19arch/x86/xen/time: Cleanup code/data sections definitionsDaniel Kiper1-4/+4
Cleanup code/data sections definitions accordingly to include/linux/init.h. Signed-off-by: Daniel Kiper <[email protected]> Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
2011-05-19arch/x86/xen/xen-ops: Cleanup code/data sections definitionsDaniel Kiper1-1/+1
Cleanup code/data sections definitions accordingly to include/linux/init.h. Signed-off-by: Daniel Kiper <[email protected]> Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
2011-05-19arch/x86/xen/mmu: Cleanup code/data sections definitionsDaniel Kiper1-17/+17
Cleanup code/data sections definitions accordingly to include/linux/init.h. Signed-off-by: Daniel Kiper <[email protected]> [v1: Rebased on top of latest linus's to include fixes in mmu.c] Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
2011-05-19hwmon: (pmbus) Add support for Analog Devices ADM1275Guenter Roeck4-0/+192
Add support for Analog Devices ADM1275 Hot-Swap Controller and Digital Power Monitor Signed-off-by: Guenter Roeck <[email protected]> Reviewed-by: Tom Grennan <[email protected]>
2011-05-19hwmon: (pmbus) Support for TI UCD90xxx series Sequencer and System Health ↵Guenter Roeck4-1/+402
Controllers Hardware monitoring support for TI UCD90120, UCD90124, UCD9090, and UCD90910 Sequencer and System Health Controllers. Signed-off-by: Guenter Roeck <[email protected]> Reviewed-by: Tom Grennan <[email protected]>
2011-05-19hwmon: (pmbus) Add support for TI UCD9200 series of PWM System ControllersGuenter Roeck4-0/+333
This patch adds hardware monitoring support for TI UCD9220, UCD9222, UCD9224, UCD9240, UCD9244, UCD9246, and UCD9248 Digital PWM System Controllers. Signed-off-by: Guenter Roeck <[email protected]> Reviewed-by: Tom Grennan <[email protected]>
2011-05-19hwmon: (pmbus) Use device specific function to read fan configurationGuenter Roeck1-4/+2
Fan control implementation tends to be device specific, so start using the device specific function call to read fan configuration registers. Signed-off-by: Guenter Roeck <[email protected]> Reviewed-by: Tom Grennan <[email protected]>
2011-05-19hwmon: (pmbus) Expand scope of device specific get_status functionGuenter Roeck4-22/+27
Some devices use non-standard registers to access various functionality. This does not only affect status registers, but other registers as well. Rename local get_status function to get_byte_data to reflect this requirement. Signed-off-by: Guenter Roeck <[email protected]> Reviewed-by: Tom Grennan <[email protected]>
2011-05-19hwmon: (pmbus) Introduce infrastructure to detect sensors and limit registersGuenter Roeck1-514/+421
This commit replaces hard-coded sensor and limit register detection code with table based sensor detection. This change eliminates code block repetition and reduces code size. Signed-off-by: Guenter Roeck <[email protected]> Reviewed-by: Tom Grennan <[email protected]>
2011-05-19hwmon: Driver for MAX16065 System Manager and compatiblesGuenter Roeck4-0/+832
This patch adds hardware monitoring support for Maxim MAX16065, MAX16066, MAX16067, MAX16068, MAX16070, and MAX16071 flash-configurable system managers with nonvolatile fault registers. Signed-off-by: Guenter Roeck <[email protected]> Reviewed-by: Jean Delvare <[email protected]>
2011-05-19hwmon: (sht15) add support for CRC validationJerome Oufella3-20/+183
The sht15 sensor allows validating exchanges to and from the device using a crc8 function. An utility function to reverse a byte has also been added. Signed-off-by: Jerome Oufella <[email protected]> Acked-by: Jonathan Cameron <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-05-19hwmon: (sht15) add support for the status registerVivien Didelot3-35/+245
* Add support for: - Heater. - End of battery notice. - Ability not to reload from OTP. - Low resolution (12bit temp, 8bit humidity). * Add an utility function to read individual bytes from the device. Signed-off-by: Vivien Didelot <[email protected]> Acked-by: Jonathan Cameron <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-05-19hwmon: (sht15) clean-up the probe functionVivien Didelot1-8/+46
* Move the creation of sysfs attributes after the end of the initialization, and remove them in the error path. * Release regulator in the error path. * Add a soft reset command (need to wait 11ms before next command). Signed-off-by: Vivien Didelot <[email protected]> Acked-by: Jonathan Cameron <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-05-19hwmon: (sht15) general code clean-upVivien Didelot3-119/+203
* Add a documentation file for the device. * Respect a bit more the kernel-doc syntax. * Rename some variables for clarity. * Use bool type for flags. * Use an enum for states (actions being done). Signed-off-by: Vivien Didelot <[email protected]> Acked-by: Jonathan Cameron <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-05-19hwmon: Add support for MAX6642Per Dalén4-0/+389
MAX6642 is a SMBus-Compatible Remote/Local Temperature Sensor with Overtemperature Alarm from Maxim. Signed-off-by: Per Dalen <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2011-05-19cfg80211: Use consistent BSS matching between scan and smeJouni Malinen9-15/+31
cfg80211 scan code adds separate BSS entries if the same BSS shows up on multiple channels. However, sme implementation does not use the frequency when fetching the BSS entry. Fix this by adding channel information to cfg80211_roamed() and include it in cfg80211_get_bss() calls. Please note that drivers using cfg80211_roamed() need to be modified to fully implement this fix. This commit includes only minimal changes to avoid compilation issues; it maintains the old (broken) behavior for most drivers. ath6kl was the only one that I could test, so I updated it to provide the operating frequency in the roamed event. Signed-off-by: Jouni Malinen <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-05-19ath9k: Fix power save wrappers in debug opsRajkumar Manoharan1-0/+8
Signed-off-by: Rajkumar Manoharan <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-05-19[CIFS] Remove sparse warningSteve French2-2/+3
Move extern for cifsConvertToUCS to different header to prevent following warning: CHECK fs/cifs/cifs_unicode.c fs/cifs/cifs_unicode.c:267:1: warning: symbol 'cifsConvertToUCS' was not declared. Should it be static? Signed-off-by: Steve French <[email protected]> Signed-off-by: Pavel Shilovsky <[email protected]> Signed-off-by: Steve French <[email protected]>
2011-05-19[CIFS] Update cifs to version 1.72Steve French1-1/+1
Signed-off-by: Steve French <[email protected]>
2011-05-19cifs: Change key name to cifs.idmap, misc. clean-upShirish Pargaonkar3-62/+6
Change idmap key name from cifs.cifs_idmap to cifs.idmap. Removed unused structure wksidarr and function match_sid(). Handle errors correctly in function init_cifs(). Signed-off-by: Shirish Pargaonkar <[email protected]> Reviewed-by: Jeff Layton <[email protected]> Signed-off-by: Steve French <[email protected]>
2011-05-19cifs: Unconditionally copy mount options to superblock infoSean Finney4-16/+6
Previously mount options were copied and updated in the cifs_sb_info struct only when CONFIG_CIFS_DFS_UPCALL was enabled. Making this information generally available allows us to remove a number of ifdefs, extra function params, and temporary variables. Reviewed-by: Jeff Layton <[email protected]> Signed-off-by: Sean Finney <[email protected]> Signed-off-by: Steve French <[email protected]>
2011-05-19cifs: Use kstrndup for cifs_sb->mountdataSean Finney1-11/+6
A relatively minor nit, but also clarified the "consensus" from the preceding comments that it is in fact better to try for the kstrdup early and cleanup while cleaning up is still a simple thing to do. Reviewed-By: Steve French <[email protected]> Signed-off-by: Sean Finney <[email protected]> Signed-off-by: Pavel Shilovsky <[email protected]> Signed-off-by: Steve French <[email protected]>