Fix compilation without DPDK

tbarbette · Aug 10, 2023 · 5ec2a15 · 5ec2a15
1 parent 007fd02
commit 5ec2a15
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/elements/analysis/recordtimestamp.cc b/elements/analysis/recordtimestamp.cc
@@ -37,7 +37,7 @@ RecordTimestamp::RecordTimestamp() :
 RecordTimestamp::~RecordTimestamp() {
 }
 
-
+#if HAVE_DPDK
 inline uint16_t
 RecordTimestamp::calc_latency(uint16_t port __rte_unused, uint16_t qidx,
  struct rte_mbuf **pkts, uint16_t nb_pkts, void *ptr)
@@ -58,8 +58,8 @@ RecordTimestamp::calc_latency(uint16_t port __rte_unused, uint16_t qidx,
  rt->_timestamps[n] = TimestampT::now_steady();
  }
  return nb_pkts;
-
 }
+#endif
 
 int RecordTimestamp::configure(Vector<String> &conf, ErrorHandler *errh) {
  uint32_t n = 0;
@@ -71,8 +71,10 @@ int RecordTimestamp::configure(Vector<String> &conf, ErrorHandler *errh) {
  if (Args(conf, this, errh)
  .read("COUNTER", e)
  .read("N", n)
+#if HAVE_DPDK
  .read("TXDEV", ElementCastArg("ToDPDKDevice"), _tx_dev)
  .read("TXDEV_QID", _tx_dev_id)
+#endif
  .read_or_set("OFFSET", _offset, -1)
  .read_or_set("DYNAMIC", _dynamic, false)
  .read_or_set("NET_ORDER", _net_order, false)

diff --git a/elements/analysis/recordtimestamp.hh b/elements/analysis/recordtimestamp.hh
@@ -107,7 +107,9 @@ private:
  bool _dynamic;
  bool _net_order;
  uint32_t _sample;
+#if HAVE_DPDK
  ToDPDKDevice* _tx_dev;
+#endif
  Vector<TimestampT> _timestamps;
  NumberPacket *_np;
 };

diff --git a/vendor/nicscheduler/methods/rss.cc b/vendor/nicscheduler/methods/rss.cc
@@ -1,10 +1,12 @@
 /**
  * RSS base
  */
-#if RTE_VERSION >= RTE_VERSION_NUM(21,8,0,0)
+#if HAVE_DPDK
+# if RTE_VERSION >= RTE_VERSION_NUM(21,8,0,0)
 #define ETH_RSS_IPV4 RTE_ETH_RSS_IPV4
 #define ETH_RSS_NONFRAG_IPV4_TCP RTE_ETH_RSS_NONFRAG_IPV4_TCP
 #define ETH_RSS_NONFRAG_IPV4_UDP RTE_ETH_RSS_NONFRAG_IPV4_UDP
+# endif
 #endif
 
 MethodRSS::MethodRSS(NICScheduler* b, EthernetDevice* fd) :