mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-24 09:50:04 +00:00
Code Issues Releases Wiki Activity

hv_netvsc: Eliminate send_completion from struct hv_netvsc_packet

Browse source 
Eliminate send_completion from struct hv_netvsc_packet.

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:08 -08:00 committed by David S. Miller
parent c4b20c6370
commit 09215ef5df
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;
};

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

@ -653,8 +653,8 @@ 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->
send_completion_ctx);
netvsc_xmit_completion(nvsc_packet->
send_completion_ctx);
}
num_outstanding_sends =
@ -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;

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

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

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

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