net/ixgbe: delete useless function declaration

Delete useless function declarations in file ixgbe_flow.c and
adjust function definition position to avoid compile error.

Signed-off-by: Wei Zhao <wei.zhao1@intel.com>

diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c
index 546c592..48a06a6 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_flow.c
+++ b/drivers/net/ixgbe/ixgbe_flow.c
@@ -75,104 +75,6 @@
 #include "base/ixgbe_phy.h"
 #include "rte_pmd_ixgbe.h"
 
-static int ixgbe_flow_flush(struct rte_eth_dev *dev,
-               struct rte_flow_error *error);
-static int
-cons_parse_ntuple_filter(const struct rte_flow_attr *attr,
-                                       const struct rte_flow_item pattern[],
-                                       const struct rte_flow_action actions[],
-                                       struct rte_eth_ntuple_filter *filter,
-                                       struct rte_flow_error *error);
-static int
-ixgbe_parse_ntuple_filter(const struct rte_flow_attr *attr,
-                                       const struct rte_flow_item pattern[],
-                                       const struct rte_flow_action actions[],
-                                       struct rte_eth_ntuple_filter *filter,
-                                       struct rte_flow_error *error);
-static int
-cons_parse_ethertype_filter(const struct rte_flow_attr *attr,
-                           const struct rte_flow_item *pattern,
-                           const struct rte_flow_action *actions,
-                           struct rte_eth_ethertype_filter *filter,
-                           struct rte_flow_error *error);
-static int
-ixgbe_parse_ethertype_filter(const struct rte_flow_attr *attr,
-                               const struct rte_flow_item pattern[],
-                               const struct rte_flow_action actions[],
-                               struct rte_eth_ethertype_filter *filter,
-                               struct rte_flow_error *error);
-static int
-cons_parse_syn_filter(const struct rte_flow_attr *attr,
-               const struct rte_flow_item pattern[],
-               const struct rte_flow_action actions[],
-               struct rte_eth_syn_filter *filter,
-               struct rte_flow_error *error);
-static int
-ixgbe_parse_syn_filter(const struct rte_flow_attr *attr,
-                               const struct rte_flow_item pattern[],
-                               const struct rte_flow_action actions[],
-                               struct rte_eth_syn_filter *filter,
-                               struct rte_flow_error *error);
-static int
-cons_parse_l2_tn_filter(const struct rte_flow_attr *attr,
-               const struct rte_flow_item pattern[],
-               const struct rte_flow_action actions[],
-               struct rte_eth_l2_tunnel_conf *filter,
-               struct rte_flow_error *error);
-static int
-ixgbe_validate_l2_tn_filter(struct rte_eth_dev *dev,
-                       const struct rte_flow_attr *attr,
-                       const struct rte_flow_item pattern[],
-                       const struct rte_flow_action actions[],
-                       struct rte_eth_l2_tunnel_conf *rule,
-                       struct rte_flow_error *error);
-static int
-ixgbe_validate_fdir_filter(struct rte_eth_dev *dev,
-                       const struct rte_flow_attr *attr,
-                       const struct rte_flow_item pattern[],
-                       const struct rte_flow_action actions[],
-                       struct ixgbe_fdir_rule *rule,
-                       struct rte_flow_error *error);
-static int
-ixgbe_parse_fdir_filter_normal(const struct rte_flow_attr *attr,
-               const struct rte_flow_item pattern[],
-               const struct rte_flow_action actions[],
-               struct ixgbe_fdir_rule *rule,
-               struct rte_flow_error *error);
-static int
-ixgbe_parse_fdir_filter_tunnel(const struct rte_flow_attr *attr,
-               const struct rte_flow_item pattern[],
-               const struct rte_flow_action actions[],
-               struct ixgbe_fdir_rule *rule,
-               struct rte_flow_error *error);
-static int
-ixgbe_parse_fdir_filter(const struct rte_flow_attr *attr,
-               const struct rte_flow_item pattern[],
-               const struct rte_flow_action actions[],
-               struct ixgbe_fdir_rule *rule,
-               struct rte_flow_error *error);
-static int
-ixgbe_flow_validate(__rte_unused struct rte_eth_dev *dev,
-               const struct rte_flow_attr *attr,
-               const struct rte_flow_item pattern[],
-               const struct rte_flow_action actions[],
-               struct rte_flow_error *error);
-static struct rte_flow *ixgbe_flow_create(struct rte_eth_dev *dev,
-               const struct rte_flow_attr *attr,
-               const struct rte_flow_item pattern[],
-               const struct rte_flow_action actions[],
-               struct rte_flow_error *error);
-static int ixgbe_flow_destroy(struct rte_eth_dev *dev,
-               struct rte_flow *flow,
-               struct rte_flow_error *error);
-
-const struct rte_flow_ops ixgbe_flow_ops = {
-       ixgbe_flow_validate,
-       ixgbe_flow_create,
-       ixgbe_flow_destroy,
-       ixgbe_flow_flush,
-       NULL,
-};
 
 #define IXGBE_MIN_N_TUPLE_PRIO 1
 #define IXGBE_MAX_N_TUPLE_PRIO 7
@@ -2404,45 +2306,45 @@ ixgbe_parse_fdir_filter_tunnel(const struct rte_flow_attr *attr,
 }
 
 static int
-ixgbe_validate_fdir_filter(struct rte_eth_dev *dev,
-                       const struct rte_flow_attr *attr,
+ixgbe_parse_fdir_filter(const struct rte_flow_attr *attr,
                        const struct rte_flow_item pattern[],
                        const struct rte_flow_action actions[],
                        struct ixgbe_fdir_rule *rule,
                        struct rte_flow_error *error)
 {
-       int ret = 0;
-
-       enum rte_fdir_mode fdir_mode = dev->data->dev_conf.fdir_conf.mode;
+       int ret;
 
-       ixgbe_parse_fdir_filter(attr, pattern, actions,
-                               rule, error);
+       ret = ixgbe_parse_fdir_filter_normal(attr, pattern,
+                                       actions, rule, error);
 
+       if (!ret)
+               return 0;
 
-       if (fdir_mode == RTE_FDIR_MODE_NONE ||
-           fdir_mode != rule->mode)
-               return -ENOTSUP;
+       ret = ixgbe_parse_fdir_filter_tunnel(attr, pattern,
+                                       actions, rule, error);
 
        return ret;
 }
 
 static int
-ixgbe_parse_fdir_filter(const struct rte_flow_attr *attr,
+ixgbe_validate_fdir_filter(struct rte_eth_dev *dev,
+                       const struct rte_flow_attr *attr,
                        const struct rte_flow_item pattern[],
                        const struct rte_flow_action actions[],
                        struct ixgbe_fdir_rule *rule,
                        struct rte_flow_error *error)
 {
-       int ret;
+       int ret = 0;
 
-       ret = ixgbe_parse_fdir_filter_normal(attr, pattern,
-                                       actions, rule, error);
+       enum rte_fdir_mode fdir_mode = dev->data->dev_conf.fdir_conf.mode;
 
-       if (!ret)
-               return 0;
+       ixgbe_parse_fdir_filter(attr, pattern, actions,
+                               rule, error);
 
-       ret = ixgbe_parse_fdir_filter_tunnel(attr, pattern,
-                                       actions, rule, error);
+
+       if (fdir_mode == RTE_FDIR_MODE_NONE ||
+           fdir_mode != rule->mode)
+               return -ENOTSUP;
 
        return ret;
 }
@@ -2879,3 +2781,11 @@ ixgbe_flow_flush(struct rte_eth_dev *dev,
 
        return 0;
 }
+
+const struct rte_flow_ops ixgbe_flow_ops = {
+       ixgbe_flow_validate,
+       ixgbe_flow_create,
+       ixgbe_flow_destroy,
+       ixgbe_flow_flush,
+       NULL,
+};