summaryrefslogtreecommitdiffstats
path: root/drivers/net/hyperv
diff options
context:
space:
mode:
authorNicholas Mc Guire <der.herr@hofr.at>2015-01-25 15:46:31 +0100
committerDavid S. Miller <davem@davemloft.net>2015-01-27 17:00:20 -0800
commit7390fe9c9a7ffdb0947add66efe7dedbe6b1cb6f (patch)
treec45a2ce459679b34962a08d7057e331f9436d6cc /drivers/net/hyperv
parent95f873f2fff96c592c5d863e2a39825bd8bf0500 (diff)
downloadblackbird-op-linux-7390fe9c9a7ffdb0947add66efe7dedbe6b1cb6f.tar.gz
blackbird-op-linux-7390fe9c9a7ffdb0947add66efe7dedbe6b1cb6f.zip
hyperv: netvsc.c: match wait_for_completion_timeout return type
Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hyperv')
-rw-r--r--drivers/net/hyperv/netvsc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 9f49c0129a78..d2af032ff225 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -217,7 +217,7 @@ static int netvsc_destroy_buf(struct netvsc_device *net_device)
static int netvsc_init_buf(struct hv_device *device)
{
int ret = 0;
- int t;
+ unsigned long t;
struct netvsc_device *net_device;
struct nvsp_message *init_packet;
struct net_device *ndev;
@@ -409,7 +409,8 @@ static int negotiate_nvsp_ver(struct hv_device *device,
struct nvsp_message *init_packet,
u32 nvsp_ver)
{
- int ret, t;
+ int ret;
+ unsigned long t;
memset(init_packet, 0, sizeof(struct nvsp_message));
init_packet->hdr.msg_type = NVSP_MSG_TYPE_INIT;
OpenPOWER on IntegriCloud