hv_netvsc: Eliminate send_completion from struct hv_netvsc_packet

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>

diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index 62542081a864c6ca3d4ca356b39bb8d5749566b9..f096f2fd713db7e1d7b802ccf48e2fd37fdbf545 100644 (file)
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -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;
 };
 

diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 8fbf81626bc3096909c046ab8a4aa77eb7f47948..34c16d19f05d7e085aaf68ef369aa1873eb3afd3 100644 (file)
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -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;

diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 622e62e326363fb5d9f0180428fcf453ec5a3943..8f29d805bd77c11870e741fa168d27f28f24e39c 100644 (file)
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -489,7 +489,7 @@ check_size:
        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;
 

diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index be0fa9c94f6362100ae4e9cf1e22cfd79bdb4e6e..c8af172faee3e0069e0f32aca082e1db0383416e 100644 (file)
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -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);