diff options
| author |   Stephen Hemminger <sthemmin@microsoft.com> | 2016-08-23 12:17:49 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-08-23 12:05:36 -0700 |
| commit | e5a78fad4f1eb49064e4c35d0a4263424b12124c (patch) | |
| tree | 813708a5ea1e88b9e79f0b488877992e86ee6ed7 /drivers/net/hyperv | |
| parent | hv_netvsc: make inline functions static (diff) | |
| download | linux-dev-e5a78fad4f1eb49064e4c35d0a4263424b12124c.tar.xz linux-dev-e5a78fad4f1eb49064e4c35d0a4263424b12124c.zip | |
hv_netvsc: use ARRAY_SIZE() for NDIS versions
Don't hard code size of array of NDIS versions.
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hyperv')
| -rw-r--r-- | drivers/net/hyperv/netvsc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 4ef2af63419f..110bbb8a0baa 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -577,9 +577,10 @@ static int netvsc_connect_vsp(struct hv_device *device) struct netvsc_device *net_device; struct nvsp_message *init_packet; int ndis_version; - u32 ver_list[] = { NVSP_PROTOCOL_VERSION_1, NVSP_PROTOCOL_VERSION_2, + const u32 ver_list[] = { + NVSP_PROTOCOL_VERSION_1, NVSP_PROTOCOL_VERSION_2, NVSP_PROTOCOL_VERSION_4, NVSP_PROTOCOL_VERSION_5 }; - int i, num_ver = 4; /* number of different NVSP versions */ + int i; net_device = get_outbound_net_device(device); if (!net_device) @@ -588,7 +589,7 @@ static int netvsc_connect_vsp(struct hv_device *device) init_packet = &net_device->channel_init_pkt; /* Negotiate the latest NVSP protocol supported */ - for (i = num_ver - 1; i >= 0; i--) + for (i = ARRAY_SIZE(ver_list) - 1; i >= 0; i--) if (negotiate_nvsp_ver(device, net_device, init_packet, ver_list[i]) == 0) { net_device->nvsp_version = ver_list[i]; |