]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
Merge branch 'master' into fix_deprecated_func 2840/head
authorkevin-laatz-intel <kevin.laatz@intel.com>
Mon, 2 Jul 2018 14:51:04 +0000 (15:51 +0100)
committerGitHub <noreply@github.com>
Mon, 2 Jul 2018 14:51:04 +0000 (15:51 +0100)
1  2 
src/dpdkevents.c
src/utils_dpdk.c

Simple merge
index 07ec8aeedbdc6250064ec84ee684aa4526594fcf,1d4668f3fc96f1be3be1968437b9c4c0121ae012..aee97917882c7461987a5bdc83075365cec86cb2
@@@ -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",