lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: update TODO files
  Staging: hv: Fix some missing author names
  Staging: hv: Fix vmbus event handler bug
  Staging: hv: Fix argument order in incorrect memset invocations in hyperv driver.
This commit is contained in:
Linus Torvalds
2009-12-01 10:41:40 -08:00
parent e272a18643 fb08808ca2
commit 2127816366
12 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/hv/BlkVsc.c
View File

@@ -16,6 +16,7 @@
* Place - Suite 330, Boston, MA 02111-1307 USA. * Place - Suite 330, Boston, MA 02111-1307 USA.
* *
* Authors: * Authors:
* Haiyang Zhang <haiyangz@microsoft.com>
* Hank Janssen <hjanssen@microsoft.com> * Hank Janssen <hjanssen@microsoft.com>
* *
*/ */

16
drivers/staging/hv/Channel.c
View File

@@ -611,7 +611,7 @@ void VmbusChannelClose(struct vmbus_channel *Channel)
/* Stop callback and cancel the timer asap */ /* Stop callback and cancel the timer asap */
Channel->OnChannelCallback = NULL; Channel->OnChannelCallback = NULL;
del_timer(&Channel->poll_timer); del_timer_sync(&Channel->poll_timer);
/* Send a closing message */ /* Send a closing message */
info = kmalloc(sizeof(*info) + info = kmalloc(sizeof(*info) +
@@ -978,14 +978,10 @@ void VmbusChannelOnChannelEvent(struct vmbus_channel *Channel)
{ {
DumpVmbusChannel(Channel); DumpVmbusChannel(Channel);
ASSERT(Channel->OnChannelCallback); ASSERT(Channel->OnChannelCallback);
#ifdef ENABLE_POLLING
del_timer(&Channel->poll_timer);
Channel->OnChannelCallback(Channel->ChannelCallbackContext); Channel->OnChannelCallback(Channel->ChannelCallbackContext);
channel->poll_timer.expires(jiffies + usecs_to_jiffies(100);
add_timer(&channel->poll_timer); mod_timer(&Channel->poll_timer, jiffies + usecs_to_jiffies(100));
#else
Channel->OnChannelCallback(Channel->ChannelCallbackContext);
#endif
} }
/** /**
@@ -997,10 +993,6 @@ void VmbusChannelOnTimer(unsigned long data)
if (channel->OnChannelCallback) { if (channel->OnChannelCallback) {
channel->OnChannelCallback(channel->ChannelCallbackContext); channel->OnChannelCallback(channel->ChannelCallbackContext);
#ifdef ENABLE_POLLING
channel->poll_timer.expires(jiffies + usecs_to_jiffies(100);
add_timer(&channel->poll_timer);
#endif
} }
} }

2
drivers/staging/hv/ChannelMgmt.c
View File

@@ -119,7 +119,7 @@ static inline void ReleaseVmbusChannel(void *context)
*/ */
void FreeVmbusChannel(struct vmbus_channel *Channel) void FreeVmbusChannel(struct vmbus_channel *Channel)
{ {
del_timer(&Channel->poll_timer); del_timer_sync(&Channel->poll_timer);
/* /*
* We have to release the channel's workqueue/thread in the vmbus's * We have to release the channel's workqueue/thread in the vmbus's

1
drivers/staging/hv/NetVsc.c
View File

@@ -15,6 +15,7 @@
* Place - Suite 330, Boston, MA 02111-1307 USA. * Place - Suite 330, Boston, MA 02111-1307 USA.
* *
* Authors: * Authors:
* Haiyang Zhang <haiyangz@microsoft.com>
* Hank Janssen <hjanssen@microsoft.com> * Hank Janssen <hjanssen@microsoft.com>
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>

1
drivers/staging/hv/NetVsc.h
View File

@@ -16,6 +16,7 @@
* Place - Suite 330, Boston, MA 02111-1307 USA. * Place - Suite 330, Boston, MA 02111-1307 USA.
* *
* Authors: * Authors:
* Haiyang Zhang <haiyangz@microsoft.com>
* Hank Janssen <hjanssen@microsoft.com> * Hank Janssen <hjanssen@microsoft.com>
* *
*/ */

10
drivers/staging/hv/StorVsc.c
View File

@@ -196,7 +196,7 @@ static int StorVscChannelInit(struct hv_device *Device)
* Now, initiate the vsc/vsp initialization protocol on the open * Now, initiate the vsc/vsp initialization protocol on the open
* channel * channel
*/ */
memset(request, sizeof(struct storvsc_request_extension), 0); memset(request, 0, sizeof(struct storvsc_request_extension));
request->WaitEvent = osd_WaitEventCreate(); request->WaitEvent = osd_WaitEventCreate();
vstorPacket->Operation = VStorOperationBeginInitialization; vstorPacket->Operation = VStorOperationBeginInitialization;
@@ -233,7 +233,7 @@ static int StorVscChannelInit(struct hv_device *Device)
DPRINT_INFO(STORVSC, "QUERY_PROTOCOL_VERSION_OPERATION..."); DPRINT_INFO(STORVSC, "QUERY_PROTOCOL_VERSION_OPERATION...");
/* reuse the packet for version range supported */ /* reuse the packet for version range supported */
memset(vstorPacket, sizeof(struct vstor_packet), 0); memset(vstorPacket, 0, sizeof(struct vstor_packet));
vstorPacket->Operation = VStorOperationQueryProtocolVersion; vstorPacket->Operation = VStorOperationQueryProtocolVersion;
vstorPacket->Flags = REQUEST_COMPLETION_FLAG; vstorPacket->Flags = REQUEST_COMPLETION_FLAG;
@@ -266,7 +266,7 @@ static int StorVscChannelInit(struct hv_device *Device)
/* Query channel properties */ /* Query channel properties */
DPRINT_INFO(STORVSC, "QUERY_PROPERTIES_OPERATION..."); DPRINT_INFO(STORVSC, "QUERY_PROPERTIES_OPERATION...");
memset(vstorPacket, sizeof(struct vstor_packet), 0); memset(vstorPacket, 0, sizeof(struct vstor_packet));
vstorPacket->Operation = VStorOperationQueryProperties; vstorPacket->Operation = VStorOperationQueryProperties;
vstorPacket->Flags = REQUEST_COMPLETION_FLAG; vstorPacket->Flags = REQUEST_COMPLETION_FLAG;
vstorPacket->StorageChannelProperties.PortNumber = vstorPacket->StorageChannelProperties.PortNumber =
@@ -305,7 +305,7 @@ static int StorVscChannelInit(struct hv_device *Device)
DPRINT_INFO(STORVSC, "END_INITIALIZATION_OPERATION..."); DPRINT_INFO(STORVSC, "END_INITIALIZATION_OPERATION...");
memset(vstorPacket, sizeof(struct vstor_packet), 0); memset(vstorPacket, 0, sizeof(struct vstor_packet));
vstorPacket->Operation = VStorOperationEndInitialization; vstorPacket->Operation = VStorOperationEndInitialization;
vstorPacket->Flags = REQUEST_COMPLETION_FLAG; vstorPacket->Flags = REQUEST_COMPLETION_FLAG;
@@ -508,7 +508,7 @@ static int StorVscConnectToVsp(struct hv_device *Device)
int ret; int ret;
storDriver = (struct storvsc_driver_object *)Device->Driver; storDriver = (struct storvsc_driver_object *)Device->Driver;
memset(&props, sizeof(struct vmstorage_channel_properties), 0); memset(&props, 0, sizeof(struct vmstorage_channel_properties));
/* Open the channel */ /* Open the channel */
ret = Device->Driver->VmbusChannelInterface.Open(Device, ret = Device->Driver->VmbusChannelInterface.Open(Device,

1
drivers/staging/hv/blkvsc_drv.c
View File

@@ -15,6 +15,7 @@
* Place - Suite 330, Boston, MA 02111-1307 USA. * Place - Suite 330, Boston, MA 02111-1307 USA.
* *
* Authors: * Authors:
* Haiyang Zhang <haiyangz@microsoft.com>
* Hank Janssen <hjanssen@microsoft.com> * Hank Janssen <hjanssen@microsoft.com>
*/ */
#include <linux/init.h> #include <linux/init.h>

1
drivers/staging/hv/netvsc_drv.c
View File

@@ -15,6 +15,7 @@
* Place - Suite 330, Boston, MA 02111-1307 USA. * Place - Suite 330, Boston, MA 02111-1307 USA.
* *
* Authors: * Authors:
* Haiyang Zhang <haiyangz@microsoft.com>
* Hank Janssen <hjanssen@microsoft.com> * Hank Janssen <hjanssen@microsoft.com>
*/ */
#include <linux/init.h> #include <linux/init.h>

3
drivers/staging/rtl8187se/TODO
View File

@@ -11,5 +11,4 @@ TODO:
- sparse fixes - sparse fixes
- integrate with drivers/net/wireless/rtl818x - integrate with drivers/net/wireless/rtl818x
Please send any patches to Greg Kroah-Hartman <greg@kroah.com> and Please send any patches to Greg Kroah-Hartman <greg@kroah.com>.
Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>.

3
drivers/staging/rtl8192su/TODO
View File

@@ -14,5 +14,4 @@ TODO:
- sparse fixes - sparse fixes
- integrate with drivers/net/wireless/rtl818x - integrate with drivers/net/wireless/rtl818x
Please send any patches to Greg Kroah-Hartman <greg@kroah.com> and Please send any patches to Greg Kroah-Hartman <greg@kroah.com>.
Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>.

5
drivers/staging/vt6655/TODO
View File

@@ -16,6 +16,5 @@ TODO:
- sparse fixes - sparse fixes
- integrate with drivers/net/wireless - integrate with drivers/net/wireless
Please send any patches to Greg Kroah-Hartman <greg@kroah.com>, Please send any patches to Greg Kroah-Hartman <greg@kroah.com>
Forest Bond <forest@alittletooquiet.net> and Bartlomiej Zolnierkiewicz and Forest Bond <forest@alittletooquiet.net>.
<bzolnier@gmail.com>.

5
drivers/staging/vt6656/TODO
View File

@@ -15,6 +15,5 @@ TODO:
- sparse fixes - sparse fixes
- integrate with drivers/net/wireless - integrate with drivers/net/wireless
Please send any patches to Greg Kroah-Hartman <greg@kroah.com>, Please send any patches to Greg Kroah-Hartman <greg@kroah.com>
Forest Bond <forest@alittletooquiet.net> and Bartlomiej Zolnierkiewicz and Forest Bond <forest@alittletooquiet.net>.
<bzolnier@gmail.com>.