diff options
author | Haiyang Zhang <haiyangz@microsoft.com> | 2014-04-21 17:54:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-04-23 14:48:39 -0400 |
commit | 893f66277799cd46bdf97429cc5d16a815a51273 (patch) | |
tree | 55a10758faa4065052145662badf39d3a67947b6 /drivers/net/hyperv/hyperv_net.h | |
parent | 4baab26129e0540746744232022110dbe9e011e7 (diff) |
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.h | 10 |
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 { | |||
136 | u16 q_idx; | 136 | u16 q_idx; |
137 | struct vmbus_channel *channel; | 137 | struct vmbus_channel *channel; |
138 | 138 | ||
139 | union { | 139 | u64 send_completion_tid; |
140 | struct { | 140 | void *send_completion_ctx; |
141 | u64 send_completion_tid; | 141 | void (*send_completion)(void *context); |
142 | void *send_completion_ctx; | ||
143 | void (*send_completion)(void *context); | ||
144 | } send; | ||
145 | } completion; | ||
146 | 142 | ||
147 | /* This points to the memory after page_buf */ | 143 | /* This points to the memory after page_buf */ |
148 | struct rndis_message *rndis_msg; | 144 | struct rndis_message *rndis_msg; |