aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-03-03Staging: mimio: Remove dead codeAmeya Palande1-24/+0
Signed-off-by: Ameya Palande <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03Staging: mimio: Fix checkpatch.pl spacing errorsAmeya Palande1-2/+2
Signed-off-by: Ameya Palande <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03Staging: rtl8187x: Use %pM for mac address outputJoe Perches40-251/+221
Uncompiled. Doesn't currently build anyway. Converted MAC_FMT to %pM Converted some %02x%02x%02x%02x%02x%02x to %pm Converted MAC_ARG to direct use Removed MAC_FMT and MAC_ARG macros Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03staging: slicoss Use pci_set_consistent_dma_mask.[email protected]1-5/+18
Use pci_set_consistent_dma_mask() in the case of 64-bit consistent allocations. Signed-off-by: Denis Kirjanov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03staging: slicoss Use compare_ether_addr.[email protected]2-17/+3
Use compare_ether_addr. Signed-off-by: Denis Kirjanov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03staging: slicoss Use PCI_DEVICE_TABLE.[email protected]1-8/+4
Use PCI_DEVICE_TABLE: defines array as const and puts it into the __devinitconst section. Signed-off-by: Denis Kirjanov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03staging: slicoss Use dev->stats rather than adapter->stats.[email protected]1-13/+12
Use dev->stats rather than adapter->stats. Signed-off-by: Denis Kirjanov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03staging: slicoss No need to check pointer in debugfs_remove()[email protected]1-4/+2
No need to check pointer expicitly since it has been done in debugfs_remove() Signed-off-by: Denis Kirjanov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03staging: slicoss No need type casting when using netdev_priv[email protected]1-10/+10
No need type casting when using netdev_priv. Signed-off-by: Denis Kirjanov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03staging: slicoss Check for valid hw address[email protected]1-0/+3
Check for valid hw address. Signed-off-by: Denis Kirjanov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03staging: slicoss Convert to netdev_tx_t[email protected]1-2/+2
Convert to netdev_tx_t. Signed-off-by: Denis Kirjanov <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03Staging: vme: Allow drivers to co-existMartyn Welch2-25/+27
Unable to build both drivers at the same time due to classing variables that should be declared static but aren't. Signed-off-by: Martyn Welch <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03Staging: vme: Remove old structures for implemented featuresMartyn Welch1-32/+0
Functionality for master RMW and location monitors has been implemented. Remove the commented out structures from the original codebase. Signed-off-by: Martyn Welch <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03Staging: vme: Fix checkpatch errors on VME core.Martyn Welch3-127/+126
Running checkpatch on the core VME code highlights many errors. Fix them. Signed-off-by: Martyn Welch <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03Staging: vme: Allow override of geographical address on ca91c142Martyn Welch1-2/+12
Geographical addressing only works if the VME backplane supports it. There are a large number of old backplanes which do not support geographical addressing. These boards will generally report a slot ID of zero - which is an invalid ID in the slot numbering scheme. Allow the geographical address to be over-ridden on the ca91c142 so that a slot ID can be provided manually in these circumstances. Signed-off-by: Martyn Welch <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03Staging: vme: Allow override of geographical address on tsi148Martyn Welch1-5/+20
Geographical addressing only works if the VME backplane supports it. There are a large number of old backplanes which do not support geographical addressing. These boards will generally report a slot ID of zero - which is an invalid ID in the slot numbering scheme. Allow the geographical address to be over-ridden on the tsi148 so that a slot ID can be provided manually in these circumstances. Signed-off-by: Markus Kraemer <[email protected]> Signed-off-by: Martyn Welch <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03Staging: vme: Correct vme_user error message typoMartyn Welch1-2/+2
Correction of erroneous error message in vme_user.c. Signed-off-by: Martyn Welch <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03Staging: otus: Fix branch in zfProtRspSim()Roel Kluin1-2/+1
This semicolon is misplaced. Signed-off-by: Roel Kluin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03Staging: otus: fix some sparse warningsThiago Farina1-28/+25
*apdbg.c: use NULL pointer instead of 0 interger. Also make two functions private. Signed-off-by: Thiago Farina <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03Staging: dream: remove duplicated #includeHuang Weiyi1-2/+0
Remove duplicated #include('s) in drivers/staging/dream/smd/smd_rpcrouter.c Signed-off-by: Huang Weiyi <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03Staging: dream: fix memory leak in camera error pathPavel Machek1-1/+3
cppcheck found that ctrl_pmsm is leaked if the open operation fails. Signed-off-by: Eric Sesterhenn <[email protected]> Signed-off-by: Pavel Machek <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03Staging: dream: add missing include filesPavel Machek32-1/+6149
Add missing files/includes neccessary for Dream compilation. Mark flash support as broken -- it is not present on released Dream, anyway. Signed-off-by: Pavel Machek <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03Staging: comedi: pcmad: [PATCH 3/3] cleanup printk() warningsBruce Beare1-3/+4
cleanup printk() warnings for including the facility level. cleanup add a printk("\n") to terminate the print for the non-error case. Signed-off-by: Bruce Beare <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03Staging: comedi: pcmad: Cleanup: Remove unneeded bracesBruce Beare1-4/+2
Signed-off-by: Bruce Beare <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-03-03Staging: comedi: pcmad: Cleanup: code indent warning messagesBruce Beare1-4/+4
use tabs instead of leading spaces Signed-off-by: Bruce Beare <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-02-24Linux 2.6.33Linus Torvalds1-1/+1
2010-02-24Merge branch 'urgent' of ↵Linus Torvalds1-2/+5
git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: parisc: Set PCI CLS early in boot.
2010-02-24Merge branch 'release' of ↵Linus Torvalds1-1/+1
git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Fix broken sn2 build
2010-02-24parisc: Set PCI CLS early in boot.Carlos O'Donell1-2/+5
Set the PCI CLS early in the boot process to prevent device failures. In pcibios_set_master use the new pci_cache_line_size instead of a hard-coded value. Signed-off-by: Carlos O'Donell <[email protected]> Reviewed-by: Grant Grundler <[email protected]> Signed-off-by: Kyle McMartin <[email protected]>
2010-02-24Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblazeLinus Torvalds2-20/+9
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Fix out_le32() macro microblaze: Fix cache loop function for cache range
2010-02-24Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2-12/+3
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: Revert "block: improve queue_should_plug() by looking at IO depths"
2010-02-24microblaze: Fix out_le32() macroSteven J. Magnani1-1/+1
Trailing semicolon causes compilation involving out_le32() to fail. Signed-off-by: Steven J. Magnani <[email protected]> Signed-off-by: Michal Simek <[email protected]>
2010-02-24microblaze: Fix cache loop function for cache rangeMichal Simek1-19/+8
I create wrong asm code but none test shows that this part of code is wrong. I am not convinces that were good idea to create asm optimized macros for caches. The reason is that there is not optimization with previous code that's why make sense to add old code and do some benchmarking which functions are faster. Signed-off-by: Michal Simek <[email protected]>
2010-02-23Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds11-18/+57
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: net: bug fix for vlan + gro issue tc35815: Remove a wrong netif_wake_queue() call which triggers BUG_ON cdc_ether: new PID for Ericsson C3607w to the whitelist (resubmit) IPv6: better document max_addresses parameter MAINTAINERS: update mv643xx_eth maintenance status e1000: Fix DMA mapping error handling on RX iwlwifi: sanity check before counting number of tfds can be free iwlwifi: error checking for number of tfds in queue iwlwifi: set HT flags after channel in rxon
2010-02-23net: bug fix for vlan + gro issueAjit Khaparde1-1/+1
Traffic (tcp) doesnot start on a vlan interface when gro is enabled. Even the tcp handshake was not taking place. This is because, the eth_type_trans call before the netif_receive_skb in napi_gro_finish() resets the skb->dev to napi->dev from the previously set vlan netdev interface. This causes the ip_route_input to drop the incoming packet considering it as a packet coming from a martian source. I could repro this on 2.6.32.7 (stable) and 2.6.33-rc7. With this fix, the traffic starts and the test runs fine on both vlan and non-vlan interfaces. CC: Herbert Xu <[email protected]> CC: Patrick McHardy <[email protected]> Signed-off-by: Ajit Khaparde <[email protected]> Signed-off-by: Herbert Xu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-02-23Merge branch 'release' of ↵Linus Torvalds3-14/+22
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: Be in TS_POLLING state during mwait based C-state entry ACPI: Fix regression where _PPC is not read at boot even when ignore_ppc=0 acer-wmi: Respect current backlight level when loading
2010-02-23Merge branch 'drm-linus' of ↵Linus Torvalds5-76/+210
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/vmwgfx: Fix queries if no dma buffer thrashing is occuring. drm/nv50: fix vram ptes on IGPs to point at stolen system memory drm/nv50: fix instmem binding on IGPs to point at stolen system memory drm/nv50: improve vram page table construction drm/nv50: more efficient clearing of gpu page table entries drm/nv50: make nv50_mem_vm_{bind,unbind} operate only on vram drm/nouveau: Fix up pre-nv17 analog load detection.
2010-02-23[IA64] Fix broken sn2 buildHedi Berriche1-1/+1
Revert the change made to arch/ia64/sn/kernel/setup.c by commit 204fba4aa303ea4a7bb726a539bf4a5b9e3203d0 as it breaks the build. Fixing the build the b94b08081fcecf83fa690d6c5664f6316fe72208 way breaks xpc because genksyms then fails to generate an CRC for per_cpu____sn_cnodeid_to_nasid because of limitations in the generic genksyms code. Signed-off-by: Hedi Berriche <[email protected]> Signed-off-by: Tony Luck <[email protected]>
2010-02-23Merge branch 'master' of ↵David S. Miller5-9/+27
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
2010-02-23tc35815: Remove a wrong netif_wake_queue() call which triggers BUG_ONAtsushi Nemoto1-1/+0
The netif_wake_queue() is called correctly (i.e. only on !txfull condition) from txdone routine. So Unconditional call to the netif_wake_queue() here is wrong. This might cause calling of start_xmit routine on txfull state and trigger BUG_ON. This bug does not happen when NAPI disabled. After txdone there must be at least one free tx slot. But with NAPI, this is not true anymore and the BUG_ON can hits on heavy load. In this driver NAPI was enabled on 2.6.33-rc1 so this is regression from 2.6.32 kernel. Reported-by: Ralf Roesch <[email protected]> Signed-off-by: Atsushi Nemoto <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-02-23cdc_ether: new PID for Ericsson C3607w to the whitelist (resubmit)Torgny Johansson1-0/+5
This patch adds a new vid/pid to the cdc_ether whitelist. Device added: - Ericsson Mobile Broadband variant C3607w Signed-off-by: Torgny Johansson <[email protected]> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Signed-off-by: David S. Miller <[email protected]>
2010-02-23IPv6: better document max_addresses parameterBrian Haley1-4/+4
Andrew Morton wrote: >> >From ip-sysctl.txt file in kernel documentation I can see following description >> for max_addresses: >> max_addresses - INTEGER >> Number of maximum addresses per interface. 0 disables limitation. >> It is recommended not set too large value (or 0) because it would >> be too easy way to crash kernel to allow to create too much of >> autoconfigured addresses. ^^^^^^^^^^^^^^ >> If this parameter applies only for auto-configured IP addressed, please state >> it more clearly in docs or rename the parameter to show that it refers to >> auto-configuration. It did mention autoconfigured in the text, but the below makes it more obvious. More clearly document IPv6 max_addresses parameter. Signed-off-by: Brian Haley <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-02-23MAINTAINERS: update mv643xx_eth maintenance statusLennert Buytenhek1-2/+2
I am no longer with Marvell. Signed-off-by: Lennert Buytenhek <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-02-23e1000: Fix DMA mapping error handling on RXAnton Blanchard1-1/+18
Check for error return from pci_map_single/pci_map_page and clean up. With this and the previous patch the driver was able to handle a significant percentage of errors (I set the fault injection rate to 10% and could still download large files at a reasonable speed). Signed-off-by: Anton Blanchard <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-02-23Revert "block: improve queue_should_plug() by looking at IO depths"Jens Axboe2-12/+3
This reverts commit fb1e75389bd06fd5987e9cda1b4e0305c782f854. "Benjamin S." <[email protected]> reports that the patch in question causes a big drop in sequential throughput for him, dropping from 200MB/sec down to only 70MB/sec. Needs to be investigated more fully, for now lets just revert the offending commit. Conflicts: include/linux/blkdev.h Signed-off-by: Jens Axboe <[email protected]>
2010-02-23drm/vmwgfx: Fix queries if no dma buffer thrashing is occuring.Thomas Hellstrom1-16/+92
Intercept query commands and apply relocations to their guest pointers. Signed-off-by: Thomas Hellstrom <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-02-23Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-linusDave Airlie4-60/+118
* 'nouveau/for-airlied' of ../drm-nouveau-next: drm/nv50: fix vram ptes on IGPs to point at stolen system memory drm/nv50: fix instmem binding on IGPs to point at stolen system memory drm/nv50: improve vram page table construction drm/nv50: more efficient clearing of gpu page table entries drm/nv50: make nv50_mem_vm_{bind,unbind} operate only on vram drm/nouveau: Fix up pre-nv17 analog load detection.
2010-02-23Merge branch 'pcc' into releaseLen Brown1-1/+5
2010-02-23Merge branches 'bugzilla-14207' and 'idle' into releaseLen Brown2-13/+17
2010-02-22Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2-0/+9
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: MIPS: BCM47xx: Fix 128MB RAM support MIPS: Highmem: Fix build error
Powered by cgit, Gruvboxed by Blaster4385.