system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-08 20:34:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

hv_netvsc: Eliminate rndis_msg pointer from hv_netvsc_packet structure

Browse source 
Eliminate rndis_msg pointer from hv_netvsc_packet structure.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
KY Srinivasan 2015-12-01 16:43:06 -08:00 committed by David S. Miller
parent 25b85ee890
commit 24476760ef
4 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/hyperv/hyperv_net.h
View file

@ -149,10 +149,6 @@ struct hv_netvsc_packet {
void *send_completion_ctx;
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 */
void *data;
struct hv_page_buffer *page_buf;
@ -188,10 +184,12 @@ struct rndis_device {
/* Interface */
struct rndis_message;
int netvsc_device_add(struct hv_device *device, void *additional_info);
int netvsc_device_remove(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,
struct rndis_message *resp);
void netvsc_xmit_completion(void *context);

10
drivers/net/hyperv/netvsc.c
View file

@ -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,
unsigned int section_index,
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 *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 &&
!packet->cp_partial) {
padding = net_device->pkt_align - remain;
packet->rndis_msg->msg_len += padding;
rndis_msg->msg_len += padding;
packet->total_data_buflen += padding;
}
@ -841,7 +842,8 @@ static inline int netvsc_send_pkt(
}
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;
int ret = 0, m_ret = 0;
@ -897,7 +899,7 @@ int netvsc_send(struct hv_device *device,
if (section_index != NETVSC_INVALID_INDEX) {
netvsc_copy_to_send_buf(net_device,
section_index, msd_len,
packet);
packet, rndis_msg);
packet->send_buf_index = section_index;

7
drivers/net/hyperv/netvsc_drv.c
View file

@ -483,10 +483,10 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
packet->is_data_pkt = true;
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));
memset(packet->rndis_msg, 0, RNDIS_AND_PPI_SIZE);
memset(rndis_msg, 0, RNDIS_AND_PPI_SIZE);
/* Set the completion routine */
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;
/* Add the rndis header */
rndis_msg = packet->rndis_msg;
rndis_msg->ndis_msg_type = RNDIS_MSG_PACKET;
rndis_msg->msg_len = packet->total_data_buflen;
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,
skb, packet);
ret = netvsc_send(net_device_ctx->device_ctx, packet);
ret = netvsc_send(net_device_ctx->device_ctx, packet, rndis_msg);
drop:
if (ret == 0) {

2
drivers/net/hyperv/rndis_filter.c
View file

@ -240,7 +240,7 @@ static int rndis_filter_send_request(struct rndis_device *dev,
packet->send_completion = NULL;
packet->xmit_more = false;
ret = netvsc_send(dev->net_dev->dev, packet);
ret = netvsc_send(dev->net_dev->dev, packet, NULL);
return ret;
}