From: kevin-laatz-intel <kevin.laatz@intel.com>
Date: Mon, 2 Jul 2018 14:51:04 +0000 (+0100)
Subject: Merge branch 'master' into fix_deprecated_func
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=74ee9a04ef5785b31d1acbfdcbcece3370668cfe

Merge branch 'master' into fix_deprecated_func
---

74ee9a04ef5785b31d1acbfdcbcece3370668cfe
diff --cc src/utils_dpdk.c
index 07ec8aee,1d4668f3..aee97917
--- a/src/utils_dpdk.c
+++ b/src/utils_dpdk.c
@@@ -852,12 -852,8 +852,12 @@@ uint128_t str_to_uint128(const char *st
    return lcore_mask;
  }
  
- uint8_t dpdk_helper_eth_dev_count() {
+ uint8_t dpdk_helper_eth_dev_count(void) {
 +#if RTE_VERSION < RTE_VERSION_NUM(18, 05, 0, 0)
    uint8_t ports = rte_eth_dev_count();
 +#else
 +  uint8_t ports = rte_eth_dev_count_avail();
 +#endif
    if (ports == 0) {
      ERROR(
          "%s:%d: No DPDK ports available. Check bound devices to DPDK driver.\n",