Commit ce12b810 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

netvsc: fix and cleanup rndis_filter_set_packet_filter 



Fix warning from unused set_complete variable. And rearrange code
to eliminate unnecessary goto's.

Signed-off-by: default avatarStephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ebc1dcf6

drivers/net/hyperv/rndis_filter.c

+6 −12
Original line number Original line Diff line number Diff line
@@ -819,16 +819,14 @@ int rndis_filter_set_packet_filter(struct rndis_device *dev, u32 new_filter) 
{

{

	struct rndis_request *request;

	struct rndis_request *request;

	struct rndis_set_request *set;

	struct rndis_set_request *set;

	struct rndis_set_complete *set_complete;

	int ret;

	int ret;





	request = get_rndis_request(dev, RNDIS_MSG_SET,

	request = get_rndis_request(dev, RNDIS_MSG_SET,

			RNDIS_MESSAGE_SIZE(struct rndis_set_request) +

			RNDIS_MESSAGE_SIZE(struct rndis_set_request) +

			sizeof(u32));

			sizeof(u32));

	if (!request) {

	if (!request)

		ret = -ENOMEM;

		return -ENOMEM;

		goto cleanup;



	}





	/* Setup the rndis set */

	/* Setup the rndis set */

	set = &request->request_msg.msg.set_req;

	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));

	       &new_filter, sizeof(u32));





	ret = rndis_filter_send_request(dev, request);

	ret = rndis_filter_send_request(dev, request);

	if (ret != 0)

	if (ret == 0)

		goto cleanup;



		wait_for_completion(&request->wait_event);

		wait_for_completion(&request->wait_event);





	set_complete = &request->response_msg.msg.set_complete;

cleanup:

	if (request)

	put_rndis_request(dev, request);

	put_rndis_request(dev, request);



	return ret;

	return ret;

}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE