aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Mc Guire <der.herr@hofr.at>2015-01-25 09:48:23 -0500
committerDavid S. Miller <davem@davemloft.net>2015-01-27 20:00:20 -0500
commit999028cc1ccd1cd3a1c0104c6423553d3f573197 (patch)
treedf17ce29e6c0296e9b0fbb4dae9aedfe27b44837
parent7390fe9c9a7ffdb0947add66efe7dedbe6b1cb6f (diff)
hyperv: match wait_for_completion_timeout return type
return type of wait_for_completion_timeout is unsigned long not int, this patch just fixes up the declarations. 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/rndis_filter.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index ec0c40a8f653..7bd83870b2a7 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -470,7 +470,7 @@ static int rndis_filter_query_device(struct rndis_device *dev, u32 oid,
470 struct rndis_query_request *query; 470 struct rndis_query_request *query;
471 struct rndis_query_complete *query_complete; 471 struct rndis_query_complete *query_complete;
472 int ret = 0; 472 int ret = 0;
473 int t; 473 unsigned long t;
474 474
475 if (!result) 475 if (!result)
476 return -EINVAL; 476 return -EINVAL;
@@ -560,7 +560,8 @@ int rndis_filter_set_device_mac(struct hv_device *hdev, char *mac)
560 char macstr[2*ETH_ALEN+1]; 560 char macstr[2*ETH_ALEN+1];
561 u32 extlen = sizeof(struct rndis_config_parameter_info) + 561 u32 extlen = sizeof(struct rndis_config_parameter_info) +
562 2*NWADR_STRLEN + 4*ETH_ALEN; 562 2*NWADR_STRLEN + 4*ETH_ALEN;
563 int ret, t; 563 int ret;
564 unsigned long t;
564 565
565 request = get_rndis_request(rdev, RNDIS_MSG_SET, 566 request = get_rndis_request(rdev, RNDIS_MSG_SET,
566 RNDIS_MESSAGE_SIZE(struct rndis_set_request) + extlen); 567 RNDIS_MESSAGE_SIZE(struct rndis_set_request) + extlen);
@@ -634,7 +635,8 @@ int rndis_filter_set_offload_params(struct hv_device *hdev,
634 struct ndis_offload_params *offload_params; 635 struct ndis_offload_params *offload_params;
635 struct rndis_set_complete *set_complete; 636 struct rndis_set_complete *set_complete;
636 u32 extlen = sizeof(struct ndis_offload_params); 637 u32 extlen = sizeof(struct ndis_offload_params);
637 int ret, t; 638 int ret;
639 unsigned long t;
638 u32 vsp_version = nvdev->nvsp_version; 640 u32 vsp_version = nvdev->nvsp_version;
639 641
640 if (vsp_version <= NVSP_PROTOCOL_VERSION_4) { 642 if (vsp_version <= NVSP_PROTOCOL_VERSION_4) {
@@ -708,7 +710,8 @@ int rndis_filter_set_rss_param(struct rndis_device *rdev, int num_queue)
708 struct ndis_recv_scale_param *rssp; 710 struct ndis_recv_scale_param *rssp;
709 u32 *itab; 711 u32 *itab;
710 u8 *keyp; 712 u8 *keyp;
711 int i, t, ret; 713 int i, ret;
714 unsigned long t;
712 715
713 request = get_rndis_request( 716 request = get_rndis_request(
714 rdev, RNDIS_MSG_SET, 717 rdev, RNDIS_MSG_SET,
@@ -792,7 +795,8 @@ int rndis_filter_set_packet_filter(struct rndis_device *dev, u32 new_filter)
792 struct rndis_set_request *set; 795 struct rndis_set_request *set;
793 struct rndis_set_complete *set_complete; 796 struct rndis_set_complete *set_complete;
794 u32 status; 797 u32 status;
795 int ret, t; 798 int ret;
799 unsigned long t;
796 struct net_device *ndev; 800 struct net_device *ndev;
797 801
798 ndev = dev->net_dev->ndev; 802 ndev = dev->net_dev->ndev;
@@ -848,7 +852,8 @@ static int rndis_filter_init_device(struct rndis_device *dev)
848 struct rndis_initialize_request *init; 852 struct rndis_initialize_request *init;
849 struct rndis_initialize_complete *init_complete; 853 struct rndis_initialize_complete *init_complete;
850 u32 status; 854 u32 status;
851 int ret, t; 855 int ret;
856 unsigned long t;
852 857
853 request = get_rndis_request(dev, RNDIS_MSG_INIT, 858 request = get_rndis_request(dev, RNDIS_MSG_INIT,
854 RNDIS_MESSAGE_SIZE(struct rndis_initialize_request)); 859 RNDIS_MESSAGE_SIZE(struct rndis_initialize_request));
@@ -998,7 +1003,7 @@ int rndis_filter_device_add(struct hv_device *dev,
998 struct netvsc_device_info *device_info = additional_info; 1003 struct netvsc_device_info *device_info = additional_info;
999 struct ndis_offload_params offloads; 1004 struct ndis_offload_params offloads;
1000 struct nvsp_message *init_packet; 1005 struct nvsp_message *init_packet;
1001 int t; 1006 unsigned long t;
1002 struct ndis_recv_scale_cap rsscap; 1007 struct ndis_recv_scale_cap rsscap;
1003 u32 rsscap_size = sizeof(struct ndis_recv_scale_cap); 1008 u32 rsscap_size = sizeof(struct ndis_recv_scale_cap);
1004 u32 mtu, size; 1009 u32 mtu, size;