hv_netvsc: Eliminate rndis_msg pointer from hv_netvsc_packet structure (24476760) · Commits · e / devices / android_kernel_teracube_emerald

drivers/net/hyperv/hyperv_net.h

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -149,10 +149,6 @@ struct hv_netvsc_packet {
	void *send_completion_ctx;		void *send_completion_ctx;
	void (send_completion)(void context);		void (send_completion)(void context);


	/* This points to the memory after page_buf */
	struct rndis_message *rndis_msg;

	/* Points to the send/receive buffer where the ethernet frame is */		/* Points to the send/receive buffer where the ethernet frame is */
	void *data;		void *data;
	struct hv_page_buffer *page_buf;		struct hv_page_buffer *page_buf;
	@@ -188,10 +184,12 @@ struct rndis_device {


	/* Interface */		/* Interface */
			struct rndis_message;
	int netvsc_device_add(struct hv_device device, void additional_info);		int netvsc_device_add(struct hv_device device, void additional_info);
	int netvsc_device_remove(struct hv_device *device);		int netvsc_device_remove(struct hv_device *device);
	int netvsc_send(struct hv_device *device,		int netvsc_send(struct hv_device *device,
	struct hv_netvsc_packet *packet);		struct hv_netvsc_packet *packet,
			struct rndis_message *rndis_msg);
	void netvsc_linkstatus_callback(struct hv_device *device_obj,		void netvsc_linkstatus_callback(struct hv_device *device_obj,
	struct rndis_message *resp);		struct rndis_message *resp);
	void netvsc_xmit_completion(void *context);		void netvsc_xmit_completion(void *context);

drivers/net/hyperv/netvsc.c

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -706,7 +706,8 @@ static u32 netvsc_get_next_send_section(struct netvsc_device *net_device)
	static u32 netvsc_copy_to_send_buf(struct netvsc_device *net_device,		static u32 netvsc_copy_to_send_buf(struct netvsc_device *net_device,
	unsigned int section_index,		unsigned int section_index,
	u32 pend_size,		u32 pend_size,
	struct hv_netvsc_packet *packet)		struct hv_netvsc_packet *packet,
			struct rndis_message *rndis_msg)
	{		{
	char *start = net_device->send_buf;		char *start = net_device->send_buf;
	char dest = start + (section_index net_device->send_section_size)		char dest = start + (section_index net_device->send_section_size)
	@@ -722,7 +723,7 @@ static u32 netvsc_copy_to_send_buf(struct netvsc_device *net_device,
	if (packet->is_data_pkt && packet->xmit_more && remain &&		if (packet->is_data_pkt && packet->xmit_more && remain &&
	!packet->cp_partial) {		!packet->cp_partial) {
	padding = net_device->pkt_align - remain;		padding = net_device->pkt_align - remain;
	packet->rndis_msg->msg_len += padding;		rndis_msg->msg_len += padding;
	packet->total_data_buflen += padding;		packet->total_data_buflen += padding;
	}		}

	@@ -841,7 +842,8 @@ static inline int netvsc_send_pkt(
	}		}

	int netvsc_send(struct hv_device *device,		int netvsc_send(struct hv_device *device,
	struct hv_netvsc_packet *packet)		struct hv_netvsc_packet *packet,
			struct rndis_message *rndis_msg)
	{		{
	struct netvsc_device *net_device;		struct netvsc_device *net_device;
	int ret = 0, m_ret = 0;		int ret = 0, m_ret = 0;
	@@ -897,7 +899,7 @@ int netvsc_send(struct hv_device *device,
	if (section_index != NETVSC_INVALID_INDEX) {		if (section_index != NETVSC_INVALID_INDEX) {
	netvsc_copy_to_send_buf(net_device,		netvsc_copy_to_send_buf(net_device,
	section_index, msd_len,		section_index, msd_len,
	packet);		packet, rndis_msg);

	packet->send_buf_index = section_index;		packet->send_buf_index = section_index;

drivers/net/hyperv/netvsc_drv.c

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -483,10 +483,10 @@ static int netvsc_start_xmit(struct sk_buff skb, struct net_device net)
	packet->is_data_pkt = true;		packet->is_data_pkt = true;
	packet->total_data_buflen = skb->len;		packet->total_data_buflen = skb->len;

	packet->rndis_msg = (struct rndis_message *)((unsigned long)packet +		rndis_msg = (struct rndis_message *)((unsigned long)packet +
	sizeof(struct hv_netvsc_packet));		sizeof(struct hv_netvsc_packet));

	memset(packet->rndis_msg, 0, RNDIS_AND_PPI_SIZE);		memset(rndis_msg, 0, RNDIS_AND_PPI_SIZE);

	/* Set the completion routine */		/* Set the completion routine */
	packet->send_completion = netvsc_xmit_completion;		packet->send_completion = netvsc_xmit_completion;
	@@ -496,7 +496,6 @@ static int netvsc_start_xmit(struct sk_buff skb, struct net_device net)
	isvlan = packet->vlan_tci & VLAN_TAG_PRESENT;		isvlan = packet->vlan_tci & VLAN_TAG_PRESENT;

	/* Add the rndis header */		/* Add the rndis header */
	rndis_msg = packet->rndis_msg;
	rndis_msg->ndis_msg_type = RNDIS_MSG_PACKET;		rndis_msg->ndis_msg_type = RNDIS_MSG_PACKET;
	rndis_msg->msg_len = packet->total_data_buflen;		rndis_msg->msg_len = packet->total_data_buflen;
	rndis_pkt = &rndis_msg->msg.pkt;		rndis_pkt = &rndis_msg->msg.pkt;
	@@ -620,7 +619,7 @@ static int netvsc_start_xmit(struct sk_buff skb, struct net_device net)
	packet->page_buf_cnt = init_page_array(rndis_msg, rndis_msg_size,		packet->page_buf_cnt = init_page_array(rndis_msg, rndis_msg_size,
	skb, packet);		skb, packet);

	ret = netvsc_send(net_device_ctx->device_ctx, packet);		ret = netvsc_send(net_device_ctx->device_ctx, packet, rndis_msg);

	drop:		drop:
	if (ret == 0) {		if (ret == 0) {

drivers/net/hyperv/rndis_filter.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -240,7 +240,7 @@ static int rndis_filter_send_request(struct rndis_device *dev,
	packet->send_completion = NULL;		packet->send_completion = NULL;
	packet->xmit_more = false;		packet->xmit_more = false;

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