dpdk/rte_flow: remove unused imports

adaki4 · Dec 4, 2024 · 52b0859 · 52b0859
1 parent b463264
commit 52b0859
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/src/util-dpdk-rte-flow-pattern.c b/src/util-dpdk-rte-flow-pattern.c
@@ -51,10 +51,8 @@
  *
  */
 
-#include <cmdline_parse_etheraddr.h>
-
+#include "cmdline_parse_etheraddr.h"
 #include "util-debug.h"
-#include "util-dpdk.h"
 #include "util-dpdk-rte-flow-pattern.h"
 
 #ifdef HAVE_DPDK

diff --git a/src/util-dpdk-rte-flow-pattern.h b/src/util-dpdk-rte-flow-pattern.h
@@ -30,7 +30,9 @@
  *
  */
 
-#include "rte_flow.h"
+#ifdef HAVE_DPDK
+#include <rte_ethdev.h>
+#endif
 
 #ifndef SURICATA_RTE_FLOW_RULES_PATTERN_H
 #define SURICATA_RTE_FLOW_RULES_PATTERN_H

diff --git a/src/util-dpdk-rte-flow.c b/src/util-dpdk-rte-flow.c
@@ -30,9 +30,9 @@
  *
  */
 
+#include "decode.h"
 #include "runmode-dpdk.h"
 #include "util-debug.h"
-#include "util-dpdk.h"
 #include "util-dpdk-rte-flow.h"
 #include "util-dpdk-rte-flow-pattern.h"
 
@@ -158,14 +158,14 @@ static void iceDeviceError(struct rte_flow_item *items)
 /**
  * \brief Specify ambigous error messages as some drivers have specific
  * behaviour when creating rte_flow rules */
-static void DriverSpecificErrorMessage(char *driver_name, struct rte_flow_item *items)
+static void DriverSpecificErrorMessage(const char *driver_name, struct rte_flow_item *items)
 {
     if (strcmp(driver_name, "net_ice") == 0) {
         iceDeviceError(items);
     }
 }
 
-int CreateRules(char *port_name, int port_id, RuleStorage *rule_storage, char *driver_name)
+int CreateRules(char *port_name, int port_id, RuleStorage *rule_storage, const char *driver_name)
 {
     SCEnter();
     int failed_count = 0;

diff --git a/src/util-dpdk-rte-flow.h b/src/util-dpdk-rte-flow.h
@@ -30,15 +30,13 @@
  *
  */
 #include "conf.h"
-#include "decode.h"
-#include "source-dpdk.h"
 
 #ifndef SURICATA_RTE_FLOW_RULES_H
 #define SURICATA_RTE_FLOW_RULES_H
 
 void RuleStorageFree(RuleStorage *rule_storage);
 int ConfigLoadRTEFlowRules(ConfNode *if_root, ConfNode *if_default, const char *filter_type,
         RuleStorage *rule_storage);
-int CreateRules(char *port_name, int port_id, RuleStorage *rule_storage, char *driver_name);
+int CreateRules(char *port_name, int port_id, RuleStorage *rule_storage, const char *driver_name);
 
 #endif /* SURICATA_RTE_FLOW_RULES_H */