Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267969
b: refs/heads/master
c: 1c62787
h: refs/heads/master
i:
  267967: c186f90
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Aug 25, 2011
1 parent 81d39a6 commit cfc6c9e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fdb3c32cb7b80d28f23f005543eb4f0d6e88c2a3
refs/heads/master: 1c627870f005149e815a7db00084160cfde1bef8
28 changes: 14 additions & 14 deletions trunk/drivers/staging/hv/rndis_filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ static int rndis_filter_query_device(struct rndis_device *dev, u32 oid,
RNDIS_MESSAGE_SIZE(struct rndis_query_request));
if (!request) {
ret = -ENOMEM;
goto Cleanup;
goto cleanup;
}

/* Setup the rndis query */
Expand All @@ -450,20 +450,20 @@ static int rndis_filter_query_device(struct rndis_device *dev, u32 oid,

ret = rndis_filter_send_request(dev, request);
if (ret != 0)
goto Cleanup;
goto cleanup;

t = wait_for_completion_timeout(&request->wait_event, 5*HZ);
if (t == 0) {
ret = -ETIMEDOUT;
goto Cleanup;
goto cleanup;
}

/* Copy the response back */
query_complete = &request->response_msg.msg.query_complete;

if (query_complete->info_buflen > inresult_size) {
ret = -1;
goto Cleanup;
goto cleanup;
}

memcpy(result,
Expand All @@ -473,7 +473,7 @@ static int rndis_filter_query_device(struct rndis_device *dev, u32 oid,

*result_size = query_complete->info_buflen;

Cleanup:
cleanup:
if (request)
put_rndis_request(dev, request);

Expand Down Expand Up @@ -512,7 +512,7 @@ static int rndis_filter_set_packet_filter(struct rndis_device *dev,
sizeof(u32));
if (!request) {
ret = -ENOMEM;
goto Cleanup;
goto cleanup;
}

/* Setup the rndis set */
Expand All @@ -526,7 +526,7 @@ static int rndis_filter_set_packet_filter(struct rndis_device *dev,

ret = rndis_filter_send_request(dev, request);
if (ret != 0)
goto Cleanup;
goto cleanup;

t = wait_for_completion_timeout(&request->wait_event, 5*HZ);

Expand All @@ -543,7 +543,7 @@ static int rndis_filter_set_packet_filter(struct rndis_device *dev,
status = set_complete->status;
}

Cleanup:
cleanup:
if (request)
put_rndis_request(dev, request);
Exit:
Expand All @@ -563,7 +563,7 @@ static int rndis_filter_init_device(struct rndis_device *dev)
RNDIS_MESSAGE_SIZE(struct rndis_initialize_request));
if (!request) {
ret = -ENOMEM;
goto Cleanup;
goto cleanup;
}

/* Setup the rndis set */
Expand All @@ -578,15 +578,15 @@ static int rndis_filter_init_device(struct rndis_device *dev)
ret = rndis_filter_send_request(dev, request);
if (ret != 0) {
dev->state = RNDIS_DEV_UNINITIALIZED;
goto Cleanup;
goto cleanup;
}


t = wait_for_completion_timeout(&request->wait_event, 5*HZ);

if (t == 0) {
ret = -ETIMEDOUT;
goto Cleanup;
goto cleanup;
}

init_complete = &request->response_msg.msg.init_complete;
Expand All @@ -599,7 +599,7 @@ static int rndis_filter_init_device(struct rndis_device *dev)
ret = -EINVAL;
}

Cleanup:
cleanup:
if (request)
put_rndis_request(dev, request);

Expand All @@ -615,7 +615,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
request = get_rndis_request(dev, REMOTE_NDIS_HALT_MSG,
RNDIS_MESSAGE_SIZE(struct rndis_halt_request));
if (!request)
goto Cleanup;
goto cleanup;

/* Setup the rndis set */
halt = &request->request_msg.msg.halt_req;
Expand All @@ -626,7 +626,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)

dev->state = RNDIS_DEV_UNINITIALIZED;

Cleanup:
cleanup:
if (request)
put_rndis_request(dev, request);
return;
Expand Down

0 comments on commit cfc6c9e

Please sign in to comment.