Commit 5a4df290 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: hv: netvsc: call vmbus_sendpacket directly 



Don't do the interface indirection, it's not needed at all.

Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b3289aa8

drivers/staging/hv/netvsc.c

+35 −44
Original line number Diff line number Diff line
@@ -263,8 +263,7 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device) 
	initPacket->Messages.Version1Messages.SendReceiveBuffer.Id = NETVSC_RECEIVE_BUFFER_ID;



	/* Send the gpadl notification request */

	ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,

				initPacket,

	ret = vmbus_sendpacket(Device->channel, initPacket,

			       sizeof(struct nvsp_message),

			       (unsigned long)initPacket,

			       VmbusPacketTypeDataInBand,
@@ -390,8 +389,8 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device) 
	initPacket->Messages.Version1Messages.SendReceiveBuffer.Id = NETVSC_SEND_BUFFER_ID;



	/* Send the gpadl notification request */

	ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,

				initPacket, sizeof(struct nvsp_message),

	ret = vmbus_sendpacket(Device->channel, initPacket,

			       sizeof(struct nvsp_message),

			       (unsigned long)initPacket,

			       VmbusPacketTypeDataInBand,

			       VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
@@ -446,9 +445,7 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice) 
		revokePacket->Header.MessageType = NvspMessage1TypeRevokeReceiveBuffer;

		revokePacket->Messages.Version1Messages.RevokeReceiveBuffer.Id = NETVSC_RECEIVE_BUFFER_ID;



		ret = NetDevice->Device->Driver->VmbusChannelInterface.SendPacket(

						NetDevice->Device,

						revokePacket,

		ret = vmbus_sendpacket(NetDevice->Device->channel, revokePacket,

				       sizeof(struct nvsp_message),

				       (unsigned long)revokePacket,

				       VmbusPacketTypeDataInBand, 0);
@@ -519,8 +516,7 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice) 
		revokePacket->Header.MessageType = NvspMessage1TypeRevokeSendBuffer;

		revokePacket->Messages.Version1Messages.RevokeSendBuffer.Id = NETVSC_SEND_BUFFER_ID;



		ret = NetDevice->Device->Driver->VmbusChannelInterface.SendPacket(NetDevice->Device,

					revokePacket,

		ret = vmbus_sendpacket(NetDevice->Device->channel, revokePacket,

				       sizeof(struct nvsp_message),

				       (unsigned long)revokePacket,

				       VmbusPacketTypeDataInBand, 0);
@@ -590,8 +586,7 @@ static int NetVscConnectToVsp(struct hv_device *Device) 
	DPRINT_INFO(NETVSC, "Sending NvspMessageTypeInit...");



	/* Send the init request */

	ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,

				initPacket,

	ret = vmbus_sendpacket(Device->channel, initPacket,

			       sizeof(struct nvsp_message),

			       (unsigned long)initPacket,

			       VmbusPacketTypeDataInBand,
@@ -640,8 +635,7 @@ static int NetVscConnectToVsp(struct hv_device *Device) 
				ndisVersion & 0xFFFF;



	/* Send the init request */

	ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,

					initPacket,

	ret = vmbus_sendpacket(Device->channel, initPacket,

			       sizeof(struct nvsp_message),

			       (unsigned long)initPacket,

			       VmbusPacketTypeDataInBand, 0);
@@ -919,8 +913,7 @@ static int NetVscOnSend(struct hv_device *Device, 
						  sizeof(struct nvsp_message),

						  (unsigned long)Packet);

	} else {

		ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,

				&sendMessage,

		ret = vmbus_sendpacket(Device->channel, &sendMessage,

				       sizeof(struct nvsp_message),

				       (unsigned long)Packet,

				       VmbusPacketTypeDataInBand,
@@ -1152,10 +1145,8 @@ static void NetVscSendReceiveCompletion(struct hv_device *Device, 


retry_send_cmplt:

	/* Send the completion */

	ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,

					&recvcompMessage,

					sizeof(struct nvsp_message),

					TransactionId,

	ret = vmbus_sendpacket(Device->channel, &recvcompMessage,

			       sizeof(struct nvsp_message), TransactionId,

			       VmbusPacketTypeCompletion, 0);

	if (ret == 0) {

		/* success */