diff options
Diffstat (limited to 'drivers/staging/hv/hv_kvp.c')
| -rw-r--r-- | drivers/staging/hv/hv_kvp.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/staging/hv/hv_kvp.c b/drivers/staging/hv/hv_kvp.c index 9aa9ede..307aedc 100644 --- a/drivers/staging/hv/hv_kvp.c +++ b/drivers/staging/hv/hv_kvp.c @@ -50,6 +50,8 @@ static struct { static int kvp_send_key(int index); +#define TIMEOUT_FIRED 1 + static void kvp_respond_to_host(char *key, char *value, int error); static void kvp_work_func(struct work_struct *dummy); static void kvp_register(void); @@ -58,7 +60,6 @@ static DECLARE_DELAYED_WORK(kvp_work, kvp_work_func); static struct cb_id kvp_id = { CN_KVP_IDX, CN_KVP_VAL }; static const char kvp_name[] = "kvp_kernel_module"; -static int timeout_fired; static u8 *recv_buffer; /* * Register the kernel component with the user-level daemon. @@ -90,8 +91,7 @@ kvp_work_func(struct work_struct *dummy) * If the timer fires, the user-mode component has not responded; * process the pending transaction. */ - kvp_respond_to_host("Unknown key", "Guest timed out", timeout_fired); - timeout_fired = 1; + kvp_respond_to_host("Unknown key", "Guest timed out", TIMEOUT_FIRED); } /* @@ -177,6 +177,8 @@ kvp_respond_to_host(char *key, char *value, int error) channel = kvp_transaction.recv_channel; req_id = kvp_transaction.recv_req_id; + kvp_transaction.active = false; + if (channel->onchannel_callback == NULL) /* * We have raced with util driver being unloaded; @@ -224,7 +226,6 @@ response_done: vmbus_sendpacket(channel, recv_buffer, buf_len, req_id, VM_PKT_DATA_INBAND, 0); - kvp_transaction.active = false; } /* @@ -250,10 +251,6 @@ void hv_kvp_onchannelcallback(void *context) struct icmsg_negotiate *negop = NULL; - if (kvp_transaction.active) - return; - - vmbus_recvpacket(channel, recv_buffer, PAGE_SIZE, &recvlen, &requestid); if (recvlen > 0) { |
