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

Commit 21278163 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: 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.
parents e272a186 fb08808c

drivers/staging/hv/BlkVsc.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 * Place - Suite 330, Boston, MA 02111-1307 USA.

 *

 * Authors:

 *   Haiyang Zhang <haiyangz@microsoft.com>

 *   Hank Janssen  <hjanssen@microsoft.com>

 *

 */

drivers/staging/hv/Channel.c

+4 −12
Original line number Diff line number Diff line
@@ -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

	}

}

drivers/staging/hv/ChannelMgmt.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/hv/NetVsc.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

drivers/staging/hv/NetVsc.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 * Place - Suite 330, Boston, MA 02111-1307 USA.

 *

 * Authors:

 *   Haiyang Zhang <haiyangz@microsoft.com>

 *   Hank Janssen  <hjanssen@microsoft.com>

 *

 */