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: 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:
Коммит
2127816366
|
@ -16,6 +16,7 @@
|
|||
* Place - Suite 330, Boston, MA 02111-1307 USA.
|
||||
*
|
||||
* Authors:
|
||||
* Haiyang Zhang <haiyangz@microsoft.com>
|
||||
* Hank Janssen <hjanssen@microsoft.com>
|
||||
*
|
||||
*/
|
||||
|
|
|
@ -611,7 +611,7 @@ void VmbusChannelClose(struct vmbus_channel *Channel)
|
|||
|
||||
/* Stop callback and cancel the timer asap */
|
||||
Channel->OnChannelCallback = NULL;
|
||||
del_timer(&Channel->poll_timer);
|
||||
del_timer_sync(&Channel->poll_timer);
|
||||
|
||||
/* Send a closing message */
|
||||
info = kmalloc(sizeof(*info) +
|
||||
|
@ -978,14 +978,10 @@ void VmbusChannelOnChannelEvent(struct vmbus_channel *Channel)
|
|||
{
|
||||
DumpVmbusChannel(Channel);
|
||||
ASSERT(Channel->OnChannelCallback);
|
||||
#ifdef ENABLE_POLLING
|
||||
del_timer(&Channel->poll_timer);
|
||||
|
||||
Channel->OnChannelCallback(Channel->ChannelCallbackContext);
|
||||
channel->poll_timer.expires(jiffies + usecs_to_jiffies(100);
|
||||
add_timer(&channel->poll_timer);
|
||||
#else
|
||||
Channel->OnChannelCallback(Channel->ChannelCallbackContext);
|
||||
#endif
|
||||
|
||||
mod_timer(&Channel->poll_timer, jiffies + usecs_to_jiffies(100));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -997,10 +993,6 @@ void VmbusChannelOnTimer(unsigned long data)
|
|||
|
||||
if (channel->OnChannelCallback) {
|
||||
channel->OnChannelCallback(channel->ChannelCallbackContext);
|
||||
#ifdef ENABLE_POLLING
|
||||
channel->poll_timer.expires(jiffies + usecs_to_jiffies(100);
|
||||
add_timer(&channel->poll_timer);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -119,7 +119,7 @@ static inline void ReleaseVmbusChannel(void *context)
|
|||
*/
|
||||
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
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
* Place - Suite 330, Boston, MA 02111-1307 USA.
|
||||
*
|
||||
* Authors:
|
||||
* Haiyang Zhang <haiyangz@microsoft.com>
|
||||
* Hank Janssen <hjanssen@microsoft.com>
|
||||
*/
|
||||
#include <linux/kernel.h>
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
* Place - Suite 330, Boston, MA 02111-1307 USA.
|
||||
*
|
||||
* Authors:
|
||||
* Haiyang Zhang <haiyangz@microsoft.com>
|
||||
* Hank Janssen <hjanssen@microsoft.com>
|
||||
*
|
||||
*/
|
||||
|
|
|
@ -196,7 +196,7 @@ static int StorVscChannelInit(struct hv_device *Device)
|
|||
* Now, initiate the vsc/vsp initialization protocol on the open
|
||||
* channel
|
||||
*/
|
||||
memset(request, sizeof(struct storvsc_request_extension), 0);
|
||||
memset(request, 0, sizeof(struct storvsc_request_extension));
|
||||
request->WaitEvent = osd_WaitEventCreate();
|
||||
|
||||
vstorPacket->Operation = VStorOperationBeginInitialization;
|
||||
|
@ -233,7 +233,7 @@ static int StorVscChannelInit(struct hv_device *Device)
|
|||
DPRINT_INFO(STORVSC, "QUERY_PROTOCOL_VERSION_OPERATION...");
|
||||
|
||||
/* 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->Flags = REQUEST_COMPLETION_FLAG;
|
||||
|
||||
|
@ -266,7 +266,7 @@ static int StorVscChannelInit(struct hv_device *Device)
|
|||
/* Query channel properties */
|
||||
DPRINT_INFO(STORVSC, "QUERY_PROPERTIES_OPERATION...");
|
||||
|
||||
memset(vstorPacket, sizeof(struct vstor_packet), 0);
|
||||
memset(vstorPacket, 0, sizeof(struct vstor_packet));
|
||||
vstorPacket->Operation = VStorOperationQueryProperties;
|
||||
vstorPacket->Flags = REQUEST_COMPLETION_FLAG;
|
||||
vstorPacket->StorageChannelProperties.PortNumber =
|
||||
|
@ -305,7 +305,7 @@ static int StorVscChannelInit(struct hv_device *Device)
|
|||
|
||||
DPRINT_INFO(STORVSC, "END_INITIALIZATION_OPERATION...");
|
||||
|
||||
memset(vstorPacket, sizeof(struct vstor_packet), 0);
|
||||
memset(vstorPacket, 0, sizeof(struct vstor_packet));
|
||||
vstorPacket->Operation = VStorOperationEndInitialization;
|
||||
vstorPacket->Flags = REQUEST_COMPLETION_FLAG;
|
||||
|
||||
|
@ -508,7 +508,7 @@ static int StorVscConnectToVsp(struct hv_device *Device)
|
|||
int ret;
|
||||
|
||||
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 */
|
||||
ret = Device->Driver->VmbusChannelInterface.Open(Device,
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
* Place - Suite 330, Boston, MA 02111-1307 USA.
|
||||
*
|
||||
* Authors:
|
||||
* Haiyang Zhang <haiyangz@microsoft.com>
|
||||
* Hank Janssen <hjanssen@microsoft.com>
|
||||
*/
|
||||
#include <linux/init.h>
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
* Place - Suite 330, Boston, MA 02111-1307 USA.
|
||||
*
|
||||
* Authors:
|
||||
* Haiyang Zhang <haiyangz@microsoft.com>
|
||||
* Hank Janssen <hjanssen@microsoft.com>
|
||||
*/
|
||||
#include <linux/init.h>
|
||||
|
|
|
@ -11,5 +11,4 @@ TODO:
|
|||
- sparse fixes
|
||||
- integrate with drivers/net/wireless/rtl818x
|
||||
|
||||
Please send any patches to Greg Kroah-Hartman <greg@kroah.com> and
|
||||
Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>.
|
||||
Please send any patches to Greg Kroah-Hartman <greg@kroah.com>.
|
||||
|
|
|
@ -14,5 +14,4 @@ TODO:
|
|||
- sparse fixes
|
||||
- integrate with drivers/net/wireless/rtl818x
|
||||
|
||||
Please send any patches to Greg Kroah-Hartman <greg@kroah.com> and
|
||||
Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>.
|
||||
Please send any patches to Greg Kroah-Hartman <greg@kroah.com>.
|
||||
|
|
|
@ -16,6 +16,5 @@ TODO:
|
|||
- sparse fixes
|
||||
- integrate with drivers/net/wireless
|
||||
|
||||
Please send any patches to Greg Kroah-Hartman <greg@kroah.com>,
|
||||
Forest Bond <forest@alittletooquiet.net> and Bartlomiej Zolnierkiewicz
|
||||
<bzolnier@gmail.com>.
|
||||
Please send any patches to Greg Kroah-Hartman <greg@kroah.com>
|
||||
and Forest Bond <forest@alittletooquiet.net>.
|
||||
|
|
|
@ -15,6 +15,5 @@ TODO:
|
|||
- sparse fixes
|
||||
- integrate with drivers/net/wireless
|
||||
|
||||
Please send any patches to Greg Kroah-Hartman <greg@kroah.com>,
|
||||
Forest Bond <forest@alittletooquiet.net> and Bartlomiej Zolnierkiewicz
|
||||
<bzolnier@gmail.com>.
|
||||
Please send any patches to Greg Kroah-Hartman <greg@kroah.com>
|
||||
and Forest Bond <forest@alittletooquiet.net>.
|
||||
|
|
Загрузка…
Ссылка в новой задаче