Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96d4cbb6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: wlan-ng: Explicitly set some fields in cfg80211 interface
  Staging: octeon: depends on NETDEVICES
  Staging: spectra: depend on X86_MRST
  Staging: zram: free device memory when init fails
  Staging: rt2870sta: Add more device IDs from vendor drivers
  staging: comedi das08_cs.c: Fix io_req_t conversion
  staging: spectra needs <linux/slab.h>
  staging: hv: Fixed lockup problem with bounce_buffer scatter list
  staging: hv: Increased storvsc ringbuffer and max_io_requests
  staging: hv: Fixed the value of the 64bit-hole inside ring buffer
  staging: hv: Fixed bounce kmap problem by using correct index
  staging: hv: Fix missing functions for net_device_ops
parents d3de0eb1 aff3ea4e

drivers/staging/comedi/drivers/das08_cs.c

+0 −1
Original line number Diff line number Diff line
@@ -222,7 +222,6 @@ static int das08_pcmcia_config_loop(struct pcmcia_device *p_dev, 
		p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;

		p_dev->resource[0]->flags |=

			pcmcia_io_cfg_data_width(io->flags);

		p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;

		p_dev->resource[0]->start = io->win[0].base;

		p_dev->resource[0]->end = io->win[0].len;

		if (io->nwin > 1) {

drivers/staging/hv/netvsc_drv.c

+3 −0
Original line number Diff line number Diff line
@@ -327,6 +327,9 @@ static const struct net_device_ops device_ops = { 
	.ndo_stop =			netvsc_close,

	.ndo_start_xmit =		netvsc_start_xmit,

	.ndo_set_multicast_list =	netvsc_set_multicast_list,

	.ndo_change_mtu =		eth_change_mtu,

	.ndo_validate_addr =		eth_validate_addr,

	.ndo_set_mac_address =		eth_mac_addr,

};



static int netvsc_probe(struct device *device)

drivers/staging/hv/ring_buffer.c

+1 −2
Original line number Diff line number Diff line
@@ -193,8 +193,7 @@ GetRingBufferSize(struct hv_ring_buffer_info *RingInfo) 
static inline u64

GetRingBufferIndices(struct hv_ring_buffer_info *RingInfo)

{

	return ((u64)RingInfo->RingBuffer->WriteIndex << 32)

	|| RingInfo->RingBuffer->ReadIndex;

	return (u64)RingInfo->RingBuffer->WriteIndex << 32;

}

drivers/staging/hv/storvsc_api.h

+2 −2
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 
#include "vmbus_api.h"



/* Defines */

#define STORVSC_RING_BUFFER_SIZE			(10*PAGE_SIZE)

#define STORVSC_RING_BUFFER_SIZE			(20*PAGE_SIZE)

#define BLKVSC_RING_BUFFER_SIZE				(20*PAGE_SIZE)



#define STORVSC_MAX_IO_REQUESTS				64

#define STORVSC_MAX_IO_REQUESTS				128



/*

 * In Hyper-V, each port/path/target maps to 1 scsi host adapter.  In

drivers/staging/hv/storvsc_drv.c

+7 −4
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ static unsigned int copy_to_bounce_buffer(struct scatterlist *orig_sgl, 


		/* ASSERT(orig_sgl[i].offset + orig_sgl[i].length <= PAGE_SIZE); */



		if (j == 0)

		if (bounce_addr == 0)

			bounce_addr = (unsigned long)kmap_atomic(sg_page((&bounce_sgl[j])), KM_IRQ0);



		while (srclen) {
@@ -556,7 +556,7 @@ static unsigned int copy_from_bounce_buffer(struct scatterlist *orig_sgl, 
		destlen = orig_sgl[i].length;

		/* ASSERT(orig_sgl[i].offset + orig_sgl[i].length <= PAGE_SIZE); */



		if (j == 0)

		if (bounce_addr == 0)

			bounce_addr = (unsigned long)kmap_atomic(sg_page((&bounce_sgl[j])), KM_IRQ0);



		while (destlen) {
@@ -615,6 +615,7 @@ static int storvsc_queuecommand(struct scsi_cmnd *scmnd, 
	unsigned int request_size = 0;

	int i;

	struct scatterlist *sgl;

	unsigned int sg_count = 0;



	DPRINT_DBG(STORVSC_DRV, "scmnd %p dir %d, use_sg %d buf %p len %d "

		   "queue depth %d tagged %d", scmnd, scmnd->sc_data_direction,
@@ -697,6 +698,7 @@ static int storvsc_queuecommand(struct scsi_cmnd *scmnd, 
	request->DataBuffer.Length = scsi_bufflen(scmnd);

	if (scsi_sg_count(scmnd)) {

		sgl = (struct scatterlist *)scsi_sglist(scmnd);

		sg_count = scsi_sg_count(scmnd);



		/* check if we need to bounce the sgl */

		if (do_bounce_buffer(sgl, scsi_sg_count(scmnd)) != -1) {
@@ -731,11 +733,12 @@ static int storvsc_queuecommand(struct scsi_cmnd *scmnd, 
					      scsi_sg_count(scmnd));



			sgl = cmd_request->bounce_sgl;

			sg_count = cmd_request->bounce_sgl_count;

		}



		request->DataBuffer.Offset = sgl[0].offset;



		for (i = 0; i < scsi_sg_count(scmnd); i++) {

		for (i = 0; i < sg_count; i++) {

			DPRINT_DBG(STORVSC_DRV, "sgl[%d] len %d offset %d\n",

				   i, sgl[i].length, sgl[i].offset);

			request->DataBuffer.PfnArray[i] =