Commit 9877fa44 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Staging: hv: hv_mouse: fix up pipe size field name

Make it not camelcase.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: K. Y. Srinivasan <kys@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2012d40d
...@@ -146,7 +146,7 @@ enum pipe_prot_msg_type { ...@@ -146,7 +146,7 @@ enum pipe_prot_msg_type {
struct pipe_prt_msg { struct pipe_prt_msg {
enum pipe_prot_msg_type type; enum pipe_prot_msg_type type;
u32 DataSize; u32 size;
char Data[1]; char Data[1];
}; };
...@@ -155,7 +155,7 @@ struct pipe_prt_msg { ...@@ -155,7 +155,7 @@ struct pipe_prt_msg {
*/ */
struct mousevsc_prt_msg { struct mousevsc_prt_msg {
enum pipe_prot_msg_type type; enum pipe_prot_msg_type type;
u32 DataSize; u32 size;
union { union {
struct synthhid_protocol_request Request; struct synthhid_protocol_request Request;
struct synthhid_protocol_response Response; struct synthhid_protocol_response Response;
...@@ -383,7 +383,7 @@ static void MousevscOnReceiveDeviceInfo(struct mousevsc_dev *InputDevice, struct ...@@ -383,7 +383,7 @@ static void MousevscOnReceiveDeviceInfo(struct mousevsc_dev *InputDevice, struct
memset(&ack, sizeof(struct mousevsc_prt_msg), 0); memset(&ack, sizeof(struct mousevsc_prt_msg), 0);
ack.type = PipeMessageData; ack.type = PipeMessageData;
ack.DataSize = sizeof(struct synthhid_device_info_ack); ack.size = sizeof(struct synthhid_device_info_ack);
ack.Ack.header.type = SynthHidInitialDeviceInfoAck; ack.Ack.header.type = SynthHidInitialDeviceInfoAck;
ack.Ack.header.size = 1; ack.Ack.header.size = 1;
...@@ -455,7 +455,7 @@ static void MousevscOnReceive(struct hv_device *Device, struct vmpacket_descript ...@@ -455,7 +455,7 @@ static void MousevscOnReceive(struct hv_device *Device, struct vmpacket_descript
if (pipeMsg->type != PipeMessageData) { if (pipeMsg->type != PipeMessageData) {
pr_err("unknown pipe msg type - type %d len %d", pr_err("unknown pipe msg type - type %d len %d",
pipeMsg->type, pipeMsg->DataSize); pipeMsg->type, pipeMsg->size);
PutInputDevice(Device); PutInputDevice(Device);
return ; return ;
} }
...@@ -464,13 +464,15 @@ static void MousevscOnReceive(struct hv_device *Device, struct vmpacket_descript ...@@ -464,13 +464,15 @@ static void MousevscOnReceive(struct hv_device *Device, struct vmpacket_descript
switch (hidMsg->header.type) { switch (hidMsg->header.type) {
case SynthHidProtocolResponse: case SynthHidProtocolResponse:
memcpy(&inputDevice->ProtocolResp, pipeMsg, pipeMsg->DataSize+sizeof(struct pipe_prt_msg) - sizeof(unsigned char)); memcpy(&inputDevice->ProtocolResp, pipeMsg,
pipeMsg->size + sizeof(struct pipe_prt_msg) -
sizeof(unsigned char));
inputDevice->protocol_wait_condition = 1; inputDevice->protocol_wait_condition = 1;
wake_up(&inputDevice->ProtocolWaitEvent); wake_up(&inputDevice->ProtocolWaitEvent);
break; break;
case SynthHidInitialDeviceInfo: case SynthHidInitialDeviceInfo:
WARN_ON(pipeMsg->DataSize >= sizeof(struct hv_input_dev_info)); WARN_ON(pipeMsg->size >= sizeof(struct hv_input_dev_info));
/* /*
* Parse out the device info into device attr, * Parse out the device info into device attr,
...@@ -606,7 +608,7 @@ static int MousevscConnectToVsp(struct hv_device *Device) ...@@ -606,7 +608,7 @@ static int MousevscConnectToVsp(struct hv_device *Device)
memset(request, sizeof(struct mousevsc_prt_msg), 0); memset(request, sizeof(struct mousevsc_prt_msg), 0);
request->type = PipeMessageData; request->type = PipeMessageData;
request->DataSize = sizeof(struct synthhid_protocol_request); request->size = sizeof(struct synthhid_protocol_request);
request->Request.header.type = SynthHidProtocolRequest; request->Request.header.type = SynthHidProtocolRequest;
request->Request.header.size = sizeof(unsigned long); request->Request.header.size = sizeof(unsigned long);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment