Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09215ef5 authored by KY Srinivasan's avatar KY Srinivasan Committed by David S. Miller
Browse files

hv_netvsc: Eliminate send_completion from struct hv_netvsc_packet 



Eliminate send_completion from struct hv_netvsc_packet.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c4b20c63

drivers/net/hyperv/hyperv_net.h

+1 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ struct hv_netvsc_packet { 
	u8 rmsg_size; /* RNDIS header and PPI size */

	u8 rmsg_pgcnt; /* page count of RNDIS header and PPI */

	u8 page_buf_cnt;

	u8 pad0;

	u8 completion_func;



	u16 vlan_tci;

	u16 q_idx;
@@ -147,7 +147,6 @@ struct hv_netvsc_packet { 


	u64 send_completion_tid;

	void *send_completion_ctx;

	void (*send_completion)(void *context);

	struct hv_page_buffer *page_buf;

};

drivers/net/hyperv/netvsc.c

+3 −3
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static void netvsc_send_completion(struct netvsc_device *net_device, 
				netvsc_free_send_slot(net_device, send_index);

			q_idx = nvsc_packet->q_idx;

			channel = incoming_channel;

			nvsc_packet->send_completion(nvsc_packet->

			netvsc_xmit_completion(nvsc_packet->

					       send_completion_ctx);

		}
@@ -775,7 +775,7 @@ static inline int netvsc_send_pkt( 
		nvmsg.msg.v1_msg.send_rndis_pkt.send_buf_section_size =

			packet->total_data_buflen;



	if (packet->send_completion)

	if (packet->completion_func)

		req_id = (ulong)packet;

	else

		req_id = 0;

drivers/net/hyperv/netvsc_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net) 
	memset(rndis_msg, 0, RNDIS_AND_PPI_SIZE);



	/* Set the completion routine */

	packet->send_completion = netvsc_xmit_completion;

	packet->completion_func = 1;

	packet->send_completion_ctx = packet;

	packet->send_completion_tid = (unsigned long)skb;

drivers/net/hyperv/rndis_filter.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static int rndis_filter_send_request(struct rndis_device *dev, 
			packet->page_buf[0].len;

	}



	packet->send_completion = NULL;

	packet->completion_func = 0;

	packet->xmit_more = false;



	ret = netvsc_send(dev->net_dev->dev, packet, NULL);