aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/hyperv/hyperv_net.h
diff options
context:
space:
mode:
authorHaiyang Zhang <haiyangz@microsoft.com>2014-04-21 14:54:44 -0700
committerDavid S. Miller <davem@davemloft.net>2014-04-23 14:48:39 -0400
commit893f66277799cd46bdf97429cc5d16a815a51273 (patch)
tree55a10758faa4065052145662badf39d3a67947b6 /drivers/net/hyperv/hyperv_net.h
parenthyperv: Remove recv_pkt_list and lock (diff)
downloadlinux-dev-893f66277799cd46bdf97429cc5d16a815a51273.tar.xz
linux-dev-893f66277799cd46bdf97429cc5d16a815a51273.zip
hyperv: Simplify the send_completion variables
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>
Diffstat (limited to 'drivers/net/hyperv/hyperv_net.h')
-rw-r--r--drivers/net/hyperv/hyperv_net.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index a1af0f7711e2..d1f7826aa75f 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -136,13 +136,9 @@ struct hv_netvsc_packet {
u16 q_idx;
struct vmbus_channel *channel;
- union {
- struct {
- u64 send_completion_tid;
- void *send_completion_ctx;
- void (*send_completion)(void *context);
- } send;
- } completion;
+ u64 send_completion_tid;
+ void *send_completion_ctx;
+ void (*send_completion)(void *context);
/* This points to the memory after page_buf */
struct rndis_message *rndis_msg;