tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

Linus Torvalds 21278163 e272a186

+21 -28
+1
drivers/staging/hv/BlkVsc.c
··· 16 16 * Place - Suite 330, Boston, MA 02111-1307 USA. 17 17 * 18 18 * Authors: 19 + * Haiyang Zhang <haiyangz@microsoft.com> 19 20 * Hank Janssen <hjanssen@microsoft.com> 20 21 * 21 22 */
+4 -12
drivers/staging/hv/Channel.c
··· 611 611 612 612 /* Stop callback and cancel the timer asap */ 613 613 Channel->OnChannelCallback = NULL; 614 - del_timer(&Channel->poll_timer); 614 + del_timer_sync(&Channel->poll_timer); 615 615 616 616 /* Send a closing message */ 617 617 info = kmalloc(sizeof(*info) + ··· 978 978 { 979 979 DumpVmbusChannel(Channel); 980 980 ASSERT(Channel->OnChannelCallback); 981 - #ifdef ENABLE_POLLING 982 - del_timer(&Channel->poll_timer); 981 + 983 982 Channel->OnChannelCallback(Channel->ChannelCallbackContext); 984 - channel->poll_timer.expires(jiffies + usecs_to_jiffies(100); 985 - add_timer(&channel->poll_timer); 986 - #else 987 - Channel->OnChannelCallback(Channel->ChannelCallbackContext); 988 - #endif 983 + 984 + mod_timer(&Channel->poll_timer, jiffies + usecs_to_jiffies(100)); 989 985 } 990 986 991 987 /** ··· 993 997 994 998 if (channel->OnChannelCallback) { 995 999 channel->OnChannelCallback(channel->ChannelCallbackContext); 996 - #ifdef ENABLE_POLLING 997 - channel->poll_timer.expires(jiffies + usecs_to_jiffies(100); 998 - add_timer(&channel->poll_timer); 999 - #endif 1000 1000 } 1001 1001 } 1002 1002
+1 -1
drivers/staging/hv/ChannelMgmt.c
··· 119 119 */ 120 120 void FreeVmbusChannel(struct vmbus_channel *Channel) 121 121 { 122 - del_timer(&Channel->poll_timer); 122 + del_timer_sync(&Channel->poll_timer); 123 123 124 124 /* 125 125 * We have to release the channel's workqueue/thread in the vmbus's
+1
drivers/staging/hv/NetVsc.c
··· 15 15 * Place - Suite 330, Boston, MA 02111-1307 USA. 16 16 * 17 17 * Authors: 18 + * Haiyang Zhang <haiyangz@microsoft.com> 18 19 * Hank Janssen <hjanssen@microsoft.com> 19 20 */ 20 21 #include <linux/kernel.h>
+1
drivers/staging/hv/NetVsc.h
··· 16 16 * Place - Suite 330, Boston, MA 02111-1307 USA. 17 17 * 18 18 * Authors: 19 + * Haiyang Zhang <haiyangz@microsoft.com> 19 20 * Hank Janssen <hjanssen@microsoft.com> 20 21 * 21 22 */
+5 -5
drivers/staging/hv/StorVsc.c
··· 196 196 * Now, initiate the vsc/vsp initialization protocol on the open 197 197 * channel 198 198 */ 199 - memset(request, sizeof(struct storvsc_request_extension), 0); 199 + memset(request, 0, sizeof(struct storvsc_request_extension)); 200 200 request->WaitEvent = osd_WaitEventCreate(); 201 201 202 202 vstorPacket->Operation = VStorOperationBeginInitialization; ··· 233 233 DPRINT_INFO(STORVSC, "QUERY_PROTOCOL_VERSION_OPERATION..."); 234 234 235 235 /* reuse the packet for version range supported */ 236 - memset(vstorPacket, sizeof(struct vstor_packet), 0); 236 + memset(vstorPacket, 0, sizeof(struct vstor_packet)); 237 237 vstorPacket->Operation = VStorOperationQueryProtocolVersion; 238 238 vstorPacket->Flags = REQUEST_COMPLETION_FLAG; 239 239 ··· 266 266 /* Query channel properties */ 267 267 DPRINT_INFO(STORVSC, "QUERY_PROPERTIES_OPERATION..."); 268 268 269 - memset(vstorPacket, sizeof(struct vstor_packet), 0); 269 + memset(vstorPacket, 0, sizeof(struct vstor_packet)); 270 270 vstorPacket->Operation = VStorOperationQueryProperties; 271 271 vstorPacket->Flags = REQUEST_COMPLETION_FLAG; 272 272 vstorPacket->StorageChannelProperties.PortNumber = ··· 305 305 306 306 DPRINT_INFO(STORVSC, "END_INITIALIZATION_OPERATION..."); 307 307 308 - memset(vstorPacket, sizeof(struct vstor_packet), 0); 308 + memset(vstorPacket, 0, sizeof(struct vstor_packet)); 309 309 vstorPacket->Operation = VStorOperationEndInitialization; 310 310 vstorPacket->Flags = REQUEST_COMPLETION_FLAG; 311 311 ··· 508 508 int ret; 509 509 510 510 storDriver = (struct storvsc_driver_object *)Device->Driver; 511 - memset(&props, sizeof(struct vmstorage_channel_properties), 0); 511 + memset(&props, 0, sizeof(struct vmstorage_channel_properties)); 512 512 513 513 /* Open the channel */ 514 514 ret = Device->Driver->VmbusChannelInterface.Open(Device,
+1
drivers/staging/hv/blkvsc_drv.c
··· 15 15 * Place - Suite 330, Boston, MA 02111-1307 USA. 16 16 * 17 17 * Authors: 18 + * Haiyang Zhang <haiyangz@microsoft.com> 18 19 * Hank Janssen <hjanssen@microsoft.com> 19 20 */ 20 21 #include <linux/init.h>
+1
drivers/staging/hv/netvsc_drv.c
··· 15 15 * Place - Suite 330, Boston, MA 02111-1307 USA. 16 16 * 17 17 * Authors: 18 + * Haiyang Zhang <haiyangz@microsoft.com> 18 19 * Hank Janssen <hjanssen@microsoft.com> 19 20 */ 20 21 #include <linux/init.h>
+1 -2
drivers/staging/rtl8187se/TODO
··· 11 11 - sparse fixes 12 12 - integrate with drivers/net/wireless/rtl818x 13 13 14 - Please send any patches to Greg Kroah-Hartman <greg@kroah.com> and 15 - Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>. 14 + Please send any patches to Greg Kroah-Hartman <greg@kroah.com>.
+1 -2
drivers/staging/rtl8192su/TODO
··· 14 14 - sparse fixes 15 15 - integrate with drivers/net/wireless/rtl818x 16 16 17 - Please send any patches to Greg Kroah-Hartman <greg@kroah.com> and 18 - Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>. 17 + Please send any patches to Greg Kroah-Hartman <greg@kroah.com>.
+2 -3
drivers/staging/vt6655/TODO
··· 16 16 - sparse fixes 17 17 - integrate with drivers/net/wireless 18 18 19 - Please send any patches to Greg Kroah-Hartman <greg@kroah.com>, 20 - Forest Bond <forest@alittletooquiet.net> and Bartlomiej Zolnierkiewicz 21 - <bzolnier@gmail.com>. 19 + Please send any patches to Greg Kroah-Hartman <greg@kroah.com> 20 + and Forest Bond <forest@alittletooquiet.net>.
+2 -3
drivers/staging/vt6656/TODO
··· 15 15 - sparse fixes 16 16 - integrate with drivers/net/wireless 17 17 18 - Please send any patches to Greg Kroah-Hartman <greg@kroah.com>, 19 - Forest Bond <forest@alittletooquiet.net> and Bartlomiej Zolnierkiewicz 20 - <bzolnier@gmail.com>. 18 + Please send any patches to Greg Kroah-Hartman <greg@kroah.com> 19 + and Forest Bond <forest@alittletooquiet.net>.