lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hyperv: Simplify the send_completion variables

Browse Source 
The union contains only one member now, so we use the variables in it directly.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Reviewed-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Haiyang Zhang
2014-04-21 14:54:44 -07:00
committed by David S. Miller
parent 4baab26129
commit 893f662777
4 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/hyperv/hyperv_net.h
View File

@@ -136,13 +136,9 @@ struct hv_netvsc_packet {
u16 q_idx; u16 q_idx;
struct vmbus_channel *channel; struct vmbus_channel *channel;
union { u64 send_completion_tid;
struct { void *send_completion_ctx;
u64 send_completion_tid; void (*send_completion)(void *context);
void *send_completion_ctx;
void (*send_completion)(void *context);
} send;
} completion;
/* This points to the memory after page_buf */ /* This points to the memory after page_buf */
struct rndis_message *rndis_msg; struct rndis_message *rndis_msg;

7
drivers/net/hyperv/netvsc.c
View File

@@ -479,9 +479,8 @@ static void netvsc_send_completion(struct netvsc_device *net_device,
if (nvsc_packet) { if (nvsc_packet) {
q_idx = nvsc_packet->q_idx; q_idx = nvsc_packet->q_idx;
channel = nvsc_packet->channel; channel = nvsc_packet->channel;
nvsc_packet->completion.send.send_completion( nvsc_packet->send_completion(nvsc_packet->
nvsc_packet->completion.send. send_completion_ctx);
send_completion_ctx);
} }
num_outstanding_sends = num_outstanding_sends =
@@ -534,7 +533,7 @@ int netvsc_send(struct hv_device *device,
0xFFFFFFFF; 0xFFFFFFFF;
sendMessage.msg.v1_msg.send_rndis_pkt.send_buf_section_size = 0; sendMessage.msg.v1_msg.send_rndis_pkt.send_buf_section_size = 0;
if (packet->completion.send.send_completion) if (packet->send_completion)
req_id = (ulong)packet; req_id = (ulong)packet;
else else
req_id = 0; req_id = 0;

8
drivers/net/hyperv/netvsc_drv.c
View File

@@ -235,7 +235,7 @@ static void netvsc_xmit_completion(void *context)
{ {
struct hv_netvsc_packet *packet = (struct hv_netvsc_packet *)context; struct hv_netvsc_packet *packet = (struct hv_netvsc_packet *)context;
struct sk_buff *skb = (struct sk_buff *) struct sk_buff *skb = (struct sk_buff *)
(unsigned long)packet->completion.send.send_completion_tid; (unsigned long)packet->send_completion_tid;
kfree(packet); kfree(packet);
@@ -425,9 +425,9 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
(num_data_pgs * sizeof(struct hv_page_buffer))); (num_data_pgs * sizeof(struct hv_page_buffer)));
/* Set the completion routine */ /* Set the completion routine */
packet->completion.send.send_completion = netvsc_xmit_completion; packet->send_completion = netvsc_xmit_completion;
packet->completion.send.send_completion_ctx = packet; packet->send_completion_ctx = packet;
packet->completion.send.send_completion_tid = (unsigned long)skb; packet->send_completion_tid = (unsigned long)skb;
isvlan = packet->vlan_tci & VLAN_TAG_PRESENT; isvlan = packet->vlan_tci & VLAN_TAG_PRESENT;

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

@@ -236,7 +236,7 @@ static int rndis_filter_send_request(struct rndis_device *dev,
packet->page_buf[0].len; packet->page_buf[0].len;
} }
packet->completion.send.send_completion = NULL; packet->send_completion = NULL;
ret = netvsc_send(dev->net_dev->dev, packet); ret = netvsc_send(dev->net_dev->dev, packet);
return ret; return ret;