aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-12-04mx31moboard: fix typoRobert Schwebel1-1/+1
Currently, linux-next breaks due to a typo introduced in commit 33c4d91928bea4444b067e620496befbeb87029c This patch fixes it. Signed-off-by: Robert Schwebel <[email protected]> Cc: Valentin Longchamp <[email protected]> Cc: Sascha Hauer <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2009-12-04cfq-iosched: make nonrot check logic consistentShaohua Li1-1/+2
cfq_arm_slice_timer() has logic to disable idle window for SSD device. The same thing should be done at cfq_select_queue() too, otherwise we will still see idle window. This makes the nonrot check logic consistent in cfq. Tests in a intel SSD with low_latency knob close, below patch can triple disk thoughput for muti-thread sequential read. Signed-off-by: Shaohua Li <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2009-12-04S3C64XX: Staticise platform data for PCM devicesMark Brown1-2/+2
The symbols aren't declared and don't need to be exported, they go along with the device structure. Signed-off-by: Mark Brown <[email protected]> Acked-by: Ben Dooks <[email protected]>
2009-12-04ASoC: Rename controls with a / in wm_hubsJoonyoung Shim1-8/+8
This renames from a character / to : of controls. A / occurs below error messages. ASoC: Failed to create IN2RP/VXRP debugfs file ASoC: Failed to create IN2LP/VXRN debugfs file Signed-off-by: Joonyoung Shim <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2009-12-04io controller: quick fix for blk-cgroup and modular CFQJens Axboe1-1/+1
It's currently not an allowed configuration, so express that in Kconfig. Signed-off-by: Jens Axboe <[email protected]>
2009-12-04cfq-iosched: move IO controller declerations to a header fileJens Axboe3-3/+9
They should not be declared inside some other file that's not related to CFQ. Signed-off-by: Jens Axboe <[email protected]>
2009-12-03tcp: fix a timewait refcnt raceEric Dumazet1-3/+16
After TCP RCU conversion, tw->tw_refcnt should not be set to 1 in inet_twsk_alloc(). It allows a RCU reader to get this timewait socket, while we not yet stabilized it. Only choice we have is to set tw_refcnt to 0 in inet_twsk_alloc(), then atomic_add() it later, once everything is done. Location of this atomic_add() is tricky, because we dont want another writer to find this timewait in ehash, while tw_refcnt is still zero ! Thanks to Kapil Dakhane tests and reports. Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03tcp: connect() race with timewait reuseEric Dumazet4-18/+47
Its currently possible that several threads issuing a connect() find the same timewait socket and try to reuse it, leading to list corruptions. Condition for bug is that these threads bound their socket on same address/port of to-be-find timewait socket, and connected to same target. (SO_REUSEADDR needed) To fix this problem, we could unhash timewait socket while holding ehash lock, to make sure lookups/changes will be serialized. Only first thread finds the timewait socket, other ones find the established socket and return an EADDRNOTAVAIL error. This second version takes into account Evgeniy's review and makes sure inet_twsk_put() is called outside of locked sections. Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03be2net: Add support for ethtool self testSuresh R3-0/+223
This patch adds support for ethtool selftest. From: Suresh R <[email protected]> Signed-off-by: Ajit Khaparde <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03tcp: diag: Dont report negative values for rx queueEric Dumazet2-3/+11
Both netlink and /proc/net/tcp interfaces can report transient negative values for rx queue. ss -> State Recv-Q Send-Q Local Address:Port Peer Address:Port ESTAB -6 6 127.0.0.1:45956 127.0.0.1:3333 netstat -> tcp 4294967290 6 127.0.0.1:37784 127.0.0.1:3333 ESTABLISHED This is because we dont lock socket while computing tp->rcv_nxt - tp->copied_seq, and another CPU can update copied_seq before rcv_next in RX path. Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03net: Fix ks8851 snl NULL pointer dereference OopsTristram Ha1-2/+2
This fixes the NULL pointer dereference Oops in the ks8851 snl network driver during transmission. All socket buffers from the queue are processed inside the loop, but new workqueues have been scheduled to run. Signed-off-by: Tristram Ha <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03netdevice: provide common routine for macvlan and vlan operstate managementPatrick Mullaney4-46/+37
Provide common routine for the transition of operational state for a leaf device during a root device transition. Signed-off-by: Patrick Mullaney <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Acked-by: Patrick McHardy <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03bnx2: Refine VPD logic.Michael Chan1-28/+21
- Replace magic values with constants - Simplify length calculation and fix a bug Based on valuable feedback from Ben Hutchings <[email protected]> Signed-off-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03ixgbe: use EIAM to automask MSI-XJesse Brandeburg1-6/+19
when disabling interrupts, driver was writing with IO, this is no necessary because on ixgbe parts the hardware can "oneshot" disable and clear the interrupt. So on 82598/82599 use of EIAM should avoid one posted write per interrupt when in MSI-X mode. This should improve performance and seems to in my limited testing, reduce CPU utilization VERY slightly. Signed-off-by: Jesse Brandeburg <[email protected]> Acked-by: Peter P Waskiewicz Jr <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03ixgbe: performance tweaksJesse Brandeburg3-30/+27
drop variables that had cache lines modified in simultaneous hot paths. keep some variables modified on hot paths but make their storage per queue. cache align DMA data buffer start addresses. cache align (padding) some structures that end within a cacheline. Signed-off-by: Jesse Brandeburg <[email protected]> Acked-by: Peter P Waskiewicz Jr <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03ixgbe: change default ring sizeJesse Brandeburg1-2/+2
decrease the memory utilization of the tx / rx queue allocation by changing the default ring size to 512 (from 1024). At 1024 rx entries of 2KB each (from 4kB slab) with 16 queues ixgbe was using 64 MB of memory per port, which is not necessary. Users can still change queue lengths with ethtool -k. Signed-off-by: Jesse Brandeburg <[email protected]> Acked-by: Peter P Waskiewicz Jr <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03ixgbe: select FCoE Tx queue in ndo_select_queueYi Zou1-10/+14
This removes the Tx queue selection for FCoE traffic from ixgbe_xmit_frame() and does it in the ndo_select_queue() call, moving all Tx queue selection into a single routine. Signed-off-by: Yi Zou <[email protected]> Acked-by: Peter P Waskiewicz Jr <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03ixgbe: use known user priority for FCoE when DCB is enabledYi Zou3-13/+28
Store the user priority for FCoE and use it directly for outgoing FCoE traffic when DCB is enabled. Signed-off-by: Yi Zou <[email protected]> Acked-by: Peter P Waskiewicz Jr <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03usbnet & cdc-ether: Autosuspend for online devicesOliver Neukum3-29/+142
Using remote wakeup and delayed transmission to allow online device to go into usb autosuspend. Minimal alternate support for devices that don't support remote wakeup. Signed-off-by: Oliver Neukum <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03cdc-ether: Implement reset_resume()Oliver Neukum1-0/+1
Normal resume can do double duty as reset_resume() for this driver as it keeps no state in the device Signed-off-by: Oliver Neukum <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03libata: Clarify ata_set_lba_range_entries functionMartin K. Petersen2-11/+11
ata_set_lba_range_entries used the variable max for two different things which was confusing. Make the function take a buffer size in bytes as argument and return the used buffer size upon completion. Signed-off-by: Martin K. Petersen <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2009-12-03libata: Report zeroed read after TRIM and max discard sizeMartin K. Petersen2-3/+20
Our current TRIM payload is a single sector that can accommodate 64 * 65535 blocks being unmapped. Report this value in the Block Limits Maximum Unmap LBA count field. If a storage device supports TRIM and the DRAT and RZAT bits are set, report TPRZ=1 in Read Capacity(16). Signed-off-by: Martin K. Petersen <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2009-12-03pata_hpt3x2n: fix overclocked MWDMA0 timingBartlomiej Zolnierkiewicz1-2/+1
Remove superfluous timings table entry while at it. Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]> Acked-by: Sergei Shtylyov <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2009-12-03pata_it8213: MWDMA0 is unsupportedBartlomiej Zolnierkiewicz1-1/+1
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2009-12-03[libata] MWDMA0 is unsupported on PIIX-like PATA controllersBartlomiej Zolnierkiewicz3-3/+3
MWDMA0 timings cannot be met with the PIIX based controller programming interface. Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]> Acked-by: Sergei Shtylyov <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2009-12-03ARM: S3C6410: Correct names of IISv4 data output pin definitionsMark Brown1-3/+3
The naming of the defines suggests that there are three IISv4 ports with one data line each when in fact there is a single IISv4 port with three data lines. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2009-12-03ARM: Merge next-s3c64xx-updatesBen Dooks11-21/+160
Merge branch 'next-s3c64xx-updates' into for-rmk Conflicts: arch/arm/plat-s3c/dev-hsmmc2.c arch/arm/plat-s3c/include/plat/sdhci.h
2009-12-03Merge branch 'master' of ↵David S. Miller14-116/+192
git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
2009-12-03ARM: Merge next-s3c24xx-dev-rtpBen Dooks19-100/+305
Merge branch 'next-s3c24xx-dev-rtp' into for-rmk Conflicts: arch/arm/mach-s3c2440/mach-anubis.c
2009-12-03ARM: Merge next-s3c24xx-simtecBen Dooks73-79/+455
Merge branch 'next-s3c24xx-simtec' into for-rmk
2009-12-03Merge branch 'master' of ↵David S. Miller32-257/+253
git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
2009-12-03bnx2: Update version to 2.0.3.Michael Chan1-2/+2
Signed-off-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03bnx2: Read firmware version from VPD.Michael Chan1-3/+99
And display it through ethtool -i. Signed-off-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03bnx2: Print warning when unable to allocate the full SKB/page ring.Michael Chan1-2/+10
Signed-off-by: Michael Chan <[email protected]> Signed-off-by: Benjamin Li <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03bnx2: Dump some state during tx timeout.Michael Chan2-0/+25
To help debug the problem. Signed-off-by: Michael Chan <[email protected]> Signed-off-by: Benjamin Li <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03bnx2: Protect tx timeout reset with rtnl_lock().Michael Chan1-1/+5
To prevent race conditions with other reset events. Signed-off-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03tg3: Update version to 3.105Matt Carlson1-2/+2
This patch updates the tg3 version to 3.105. Signed-off-by: Matt Carlson <[email protected]> Reviewed-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03tg3: Clean tg3_init_one()Matt Carlson1-6/+2
Tg3's firmware is no longer loaded from tg3_init_one(). Remove the error path that releases the firmware back to the system. Signed-off-by: Matt Carlson <[email protected]> Reviewed-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03tg3: Use pci_read_vpd() instead of private methodMatt Carlson1-23/+12
If the driver needs to use PCI configuration space to read the VPD data, the accesses could collide with the pci_read_vpd() function. This patch converts the driver to use pci_read_vpd() to avoid any potential collisions. Signed-off-by: Matt Carlson <[email protected]> Reviewed-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03tg3: Add some VPD preprocessor constantsMatt Carlson3-10/+18
This patch cleans up the VPD code by creating preprocessor definitions and using them in the place of hardcoded constants. Signed-off-by: Matt Carlson <[email protected]> Reviewed-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03tg3: Add 57765 asic revMatt Carlson2-19/+62
This patch adds the 57765 asic revision. Signed-off-by: Matt Carlson <[email protected]> Signed-off-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03tg3: Make TSS enable independent of MSI-X enableMatt Carlson2-35/+57
The 57765 asic rev has MSI-X capability, but does not support TSS. This patch changes the tx paths so that TSS is explicitly mentioned, rather than implied through the ENABLE_MSIX flag. Signed-off-by: Matt Carlson <[email protected]> Signed-off-by: Michael Chan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03drivers/net: Move && and || to end of previous lineJoe Perches132-805/+799
Only files where David Miller is the primary git-signer. wireless, wimax, ixgbe, etc are not modified. Compile tested x86 allyesconfig only Not all files compiled (not x86 compatible) Added a few > 80 column lines, which I ignored. Existing checkpatch complaints ignored. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03be2net: Bump up the driver version numberAjit Khaparde1-1/+1
Signed-off-by: Ajit Khaparde <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-12-03pata_via: clear UDMA transfer mode bit for PIO and MWDMABartlomiej Zolnierkiewicz1-6/+13
Fix register naming while at it. Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2009-12-03pata_sis: Power Management fixBartlomiej Zolnierkiewicz1-2/+19
Call sis_fixup() on resume. Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2009-12-03pata_rz1000: Power Management fixBartlomiej Zolnierkiewicz1-1/+10
Fix ->resume method to re-enable & re-init PCI device properly before doing chipset specific setup. Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2009-12-03pata_radisys: fix UDMA handlingBartlomiej Zolnierkiewicz1-2/+2
Set correct bits to switch between UDMA2 and UDMA4. Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2009-12-03pata_ns87415: Power Management fixBartlomiej Zolnierkiewicz1-5/+27
Fix ->resume method to do chipset specific setup. Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2009-12-03pata_marvell: fix marvell_pre_reset() documentationBartlomiej Zolnierkiewicz1-1/+1
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>