hv_netvsc: Eliminate send_completion_ctx from struct hv_netvsc_packet

Eliminate send_completion_ctx from struct hv_netvsc_packet.

Signed-off-by: K. Y. Srinivasan <[email protected]>
Reviewed-by: Haiyang Zhang <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index f096f2fd713db7e1d7b802ccf48e2fd37fdbf545..fc6d0c6de741e00d7c31533df8998c2f53cda717 100644 (file)
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -146,7 +146,6 @@ struct hv_netvsc_packet {
 
 
        u64 send_completion_tid;
-       void *send_completion_ctx;
        struct hv_page_buffer *page_buf;
 };
 

diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 34c16d19f05d7e085aaf68ef369aa1873eb3afd3..0e0b723df1acadd66b1e188058bd61b423be05b7 100644 (file)
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -653,8 +653,7 @@ 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;
-                       netvsc_xmit_completion(nvsc_packet->
-                                              send_completion_ctx);
+                       netvsc_xmit_completion(nvsc_packet);
                }
 
                num_outstanding_sends =

diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 8f29d805bd77c11870e741fa168d27f28f24e39c..7e356a11c1d74aba8c06b7dd2fb62f2464cd1afe 100644 (file)
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -490,7 +490,6 @@ check_size:
 
        /* Set the completion routine */
        packet->completion_func = 1;
-       packet->send_completion_ctx = packet;
        packet->send_completion_tid = (unsigned long)skb;
 
        isvlan = packet->vlan_tci & VLAN_TAG_PRESENT;