diff options
| author | Nicholas Mc Guire <der.herr@hofr.at> | 2015-01-25 09:46:31 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-27 20:00:20 -0500 |
| commit | 7390fe9c9a7ffdb0947add66efe7dedbe6b1cb6f (patch) | |
| tree | c45a2ce459679b34962a08d7057e331f9436d6cc | |
| parent | 95f873f2fff96c592c5d863e2a39825bd8bf0500 (diff) | |
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>
| -rw-r--r-- | drivers/net/hyperv/netvsc.c | 5 |
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) | |||
| 217 | static int netvsc_init_buf(struct hv_device *device) | 217 | static int netvsc_init_buf(struct hv_device *device) |
| 218 | { | 218 | { |
| 219 | int ret = 0; | 219 | int ret = 0; |
| 220 | int t; | 220 | unsigned long t; |
| 221 | struct netvsc_device *net_device; | 221 | struct netvsc_device *net_device; |
| 222 | struct nvsp_message *init_packet; | 222 | struct nvsp_message *init_packet; |
| 223 | struct net_device *ndev; | 223 | struct net_device *ndev; |
| @@ -409,7 +409,8 @@ static int negotiate_nvsp_ver(struct hv_device *device, | |||
| 409 | struct nvsp_message *init_packet, | 409 | struct nvsp_message *init_packet, |
| 410 | u32 nvsp_ver) | 410 | u32 nvsp_ver) |
| 411 | { | 411 | { |
| 412 | int ret, t; | 412 | int ret; |
| 413 | unsigned long t; | ||
| 413 | 414 | ||
| 414 | memset(init_packet, 0, sizeof(struct nvsp_message)); | 415 | memset(init_packet, 0, sizeof(struct nvsp_message)); |
| 415 | init_packet->hdr.msg_type = NVSP_MSG_TYPE_INIT; | 416 | init_packet->hdr.msg_type = NVSP_MSG_TYPE_INIT; |
