Skip to content

Commit

Permalink
netvsc: fix and cleanup rndis_filter_set_packet_filter
Browse files Browse the repository at this point in the history
Fix warning from unused set_complete variable. And rearrange code
to eliminate unnecessary goto's.

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
stephen hemminger authored and David S. Miller committed Mar 23, 2017
1 parent ebc1dcf commit ce12b81
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions drivers/net/hyperv/rndis_filter.c
Original file line number Diff line number Diff line change
@@ -819,16 +819,14 @@ int rndis_filter_set_packet_filter(struct rndis_device *dev, u32 new_filter)
{
struct rndis_request *request;
struct rndis_set_request *set;
struct rndis_set_complete *set_complete;
int ret;

request = get_rndis_request(dev, RNDIS_MSG_SET,
RNDIS_MESSAGE_SIZE(struct rndis_set_request) +
sizeof(u32));
if (!request) {
ret = -ENOMEM;
goto cleanup;
}
if (!request)
return -ENOMEM;


/* Setup the rndis set */
set = &request->request_msg.msg.set_req;
@@ -840,15 +838,11 @@ int rndis_filter_set_packet_filter(struct rndis_device *dev, u32 new_filter)
&new_filter, sizeof(u32));

ret = rndis_filter_send_request(dev, request);
if (ret != 0)
goto cleanup;
if (ret == 0)
wait_for_completion(&request->wait_event);

wait_for_completion(&request->wait_event);
put_rndis_request(dev, request);

set_complete = &request->response_msg.msg.set_complete;
cleanup:
if (request)
put_rndis_request(dev, request);
return ret;
}

0 comments on commit ce12b81

Please sign in to comment.