[RFC PATCH 1/2] hv_netvsc: Split netvsc_revoke_buf() and netvsc_teardown_gpadl()

[Mohammed Gamal]

Split each of the functions into two for each of send/recv buffers

Signed-off-by: Mohammed Gamal <mga...@redhat.com>
---
 drivers/net/hyperv/netvsc.c | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index bfc7969..3982f76 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -100,8 +100,8 @@ static void free_netvsc_device_rcu(struct netvsc_device 
*nvdev)
        call_rcu(&nvdev->rcu, free_netvsc_device);
 }
 
-static void netvsc_revoke_buf(struct hv_device *device,
-                             struct netvsc_device *net_device)
+static void netvsc_revoke_recv_buf(struct hv_device *device,
+                                  struct netvsc_device *net_device)
 {
        struct nvsp_message *revoke_packet;
        struct net_device *ndev = hv_get_drvdata(device);
@@ -146,6 +146,14 @@ static void netvsc_revoke_buf(struct hv_device *device,
                }
                net_device->recv_section_cnt = 0;
        }
+}
+
+static void netvsc_revoke_send_buf(struct hv_device *device,
+                                  struct netvsc_device *net_device)
+{
+       struct nvsp_message *revoke_packet;
+       struct net_device *ndev = hv_get_drvdata(device);
+       int ret;
 
        /* Deal with the send buffer we may have setup.
         * If we got a  send section size, it means we received a
@@ -189,8 +197,8 @@ static void netvsc_revoke_buf(struct hv_device *device,
        }
 }
 
-static void netvsc_teardown_gpadl(struct hv_device *device,
-                                 struct netvsc_device *net_device)
+static void netvsc_teardown_recv_buf_gpadl(struct hv_device *device,
+                                          struct netvsc_device *net_device)
 {
        struct net_device *ndev = hv_get_drvdata(device);
        int ret;
@@ -215,6 +223,13 @@ static void netvsc_teardown_gpadl(struct hv_device *device,
                vfree(net_device->recv_buf);
                net_device->recv_buf = NULL;
        }
+}
+
+static void netvsc_teardown_send_buf_gpadl(struct hv_device *device,
+                                          struct netvsc_device *net_device)
+{
+       struct net_device *ndev = hv_get_drvdata(device);
+       int ret;
 
        if (net_device->send_buf_gpadl_handle) {
                ret = vmbus_teardown_gpadl(device->channel,
@@ -425,8 +440,10 @@ static int netvsc_init_buf(struct hv_device *device,
        goto exit;
 
 cleanup:
-       netvsc_revoke_buf(device, net_device);
-       netvsc_teardown_gpadl(device, net_device);
+       netvsc_revoke_recv_buf(device, net_device);
+       netvsc_revoke_send_buf(device, net_device);
+       netvsc_teardown_recv_buf_gpadl(device, net_device);
+       netvsc_teardown_send_buf_gpadl(device, net_device);
 
 exit:
        return ret;
@@ -558,7 +575,8 @@ void netvsc_device_remove(struct hv_device *device)
 
        cancel_work_sync(&net_device->subchan_work);
 
-       netvsc_revoke_buf(device, net_device);
+       netvsc_revoke_recv_buf(device, net_device);
+       netvsc_revoke_send_buf(device, net_device);
 
        RCU_INIT_POINTER(net_device_ctx->nvdev, NULL);
 
@@ -571,7 +589,8 @@ void netvsc_device_remove(struct hv_device *device)
        /* Now, we can close the channel safely */
        vmbus_close(device->channel);
 
-       netvsc_teardown_gpadl(device, net_device);
+       netvsc_teardown_recv_buf_gpadl(device, net_device);
+       netvsc_teardown_send_buf_gpadl(device, net_device);
 
        /* And dissassociate NAPI context from device */
        for (i = 0; i < net_device->num_chn; i++)
-- 
1.8.3.1