Commit 3f076eff authored by Mohammed Gamal's avatar Mohammed Gamal Committed by David S. Miller

hv_netvsc: Pass net_device parameter to revoke and teardown functions

The callers to netvsc_revoke_*_buf() and netvsc_teardown_*_gpadl()
already have their net_device instances. Pass them as a paramaeter to
the function instead of obtaining them from netvsc_device struct
everytime
Signed-off-by: default avatarMohammed Gamal <mgamal@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a56d99d7
...@@ -110,9 +110,9 @@ static void free_netvsc_device_rcu(struct netvsc_device *nvdev) ...@@ -110,9 +110,9 @@ static void free_netvsc_device_rcu(struct netvsc_device *nvdev)
} }
static void netvsc_revoke_recv_buf(struct hv_device *device, static void netvsc_revoke_recv_buf(struct hv_device *device,
struct netvsc_device *net_device) struct netvsc_device *net_device,
struct net_device *ndev)
{ {
struct net_device *ndev = hv_get_drvdata(device);
struct nvsp_message *revoke_packet; struct nvsp_message *revoke_packet;
int ret; int ret;
...@@ -160,9 +160,9 @@ static void netvsc_revoke_recv_buf(struct hv_device *device, ...@@ -160,9 +160,9 @@ static void netvsc_revoke_recv_buf(struct hv_device *device,
} }
static void netvsc_revoke_send_buf(struct hv_device *device, static void netvsc_revoke_send_buf(struct hv_device *device,
struct netvsc_device *net_device) struct netvsc_device *net_device,
struct net_device *ndev)
{ {
struct net_device *ndev = hv_get_drvdata(device);
struct nvsp_message *revoke_packet; struct nvsp_message *revoke_packet;
int ret; int ret;
...@@ -211,9 +211,9 @@ static void netvsc_revoke_send_buf(struct hv_device *device, ...@@ -211,9 +211,9 @@ static void netvsc_revoke_send_buf(struct hv_device *device,
} }
static void netvsc_teardown_recv_gpadl(struct hv_device *device, static void netvsc_teardown_recv_gpadl(struct hv_device *device,
struct netvsc_device *net_device) struct netvsc_device *net_device,
struct net_device *ndev)
{ {
struct net_device *ndev = hv_get_drvdata(device);
int ret; int ret;
if (net_device->recv_buf_gpadl_handle) { if (net_device->recv_buf_gpadl_handle) {
...@@ -233,9 +233,9 @@ static void netvsc_teardown_recv_gpadl(struct hv_device *device, ...@@ -233,9 +233,9 @@ static void netvsc_teardown_recv_gpadl(struct hv_device *device,
} }
static void netvsc_teardown_send_gpadl(struct hv_device *device, static void netvsc_teardown_send_gpadl(struct hv_device *device,
struct netvsc_device *net_device) struct netvsc_device *net_device,
struct net_device *ndev)
{ {
struct net_device *ndev = hv_get_drvdata(device);
int ret; int ret;
if (net_device->send_buf_gpadl_handle) { if (net_device->send_buf_gpadl_handle) {
...@@ -452,10 +452,10 @@ static int netvsc_init_buf(struct hv_device *device, ...@@ -452,10 +452,10 @@ static int netvsc_init_buf(struct hv_device *device,
goto exit; goto exit;
cleanup: cleanup:
netvsc_revoke_recv_buf(device, net_device); netvsc_revoke_recv_buf(device, net_device, ndev);
netvsc_revoke_send_buf(device, net_device); netvsc_revoke_send_buf(device, net_device, ndev);
netvsc_teardown_recv_gpadl(device, net_device); netvsc_teardown_recv_gpadl(device, net_device, ndev);
netvsc_teardown_send_gpadl(device, net_device); netvsc_teardown_send_gpadl(device, net_device, ndev);
exit: exit:
return ret; return ret;
...@@ -474,7 +474,6 @@ static int negotiate_nvsp_ver(struct hv_device *device, ...@@ -474,7 +474,6 @@ static int negotiate_nvsp_ver(struct hv_device *device,
init_packet->hdr.msg_type = NVSP_MSG_TYPE_INIT; init_packet->hdr.msg_type = NVSP_MSG_TYPE_INIT;
init_packet->msg.init_msg.init.min_protocol_ver = nvsp_ver; init_packet->msg.init_msg.init.min_protocol_ver = nvsp_ver;
init_packet->msg.init_msg.init.max_protocol_ver = nvsp_ver; init_packet->msg.init_msg.init.max_protocol_ver = nvsp_ver;
trace_nvsp_send(ndev, init_packet); trace_nvsp_send(ndev, init_packet);
/* Send the init request */ /* Send the init request */
...@@ -596,13 +595,13 @@ void netvsc_device_remove(struct hv_device *device) ...@@ -596,13 +595,13 @@ void netvsc_device_remove(struct hv_device *device)
* Revoke receive buffer. If host is pre-Win2016 then tear down * Revoke receive buffer. If host is pre-Win2016 then tear down
* receive buffer GPADL. Do the same for send buffer. * receive buffer GPADL. Do the same for send buffer.
*/ */
netvsc_revoke_recv_buf(device, net_device); netvsc_revoke_recv_buf(device, net_device, ndev);
if (vmbus_proto_version < VERSION_WIN10) if (vmbus_proto_version < VERSION_WIN10)
netvsc_teardown_recv_gpadl(device, net_device); netvsc_teardown_recv_gpadl(device, net_device, ndev);
netvsc_revoke_send_buf(device, net_device); netvsc_revoke_send_buf(device, net_device, ndev);
if (vmbus_proto_version < VERSION_WIN10) if (vmbus_proto_version < VERSION_WIN10)
netvsc_teardown_send_gpadl(device, net_device); netvsc_teardown_send_gpadl(device, net_device, ndev);
RCU_INIT_POINTER(net_device_ctx->nvdev, NULL); RCU_INIT_POINTER(net_device_ctx->nvdev, NULL);
...@@ -624,8 +623,8 @@ void netvsc_device_remove(struct hv_device *device) ...@@ -624,8 +623,8 @@ void netvsc_device_remove(struct hv_device *device)
* here after VMBus is closed. * here after VMBus is closed.
*/ */
if (vmbus_proto_version >= VERSION_WIN10) { if (vmbus_proto_version >= VERSION_WIN10) {
netvsc_teardown_recv_gpadl(device, net_device); netvsc_teardown_recv_gpadl(device, net_device, ndev);
netvsc_teardown_send_gpadl(device, net_device); netvsc_teardown_send_gpadl(device, net_device, ndev);
} }
/* Release all resources */ /* Release all resources */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment