update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / dpdk / examples / ipsec-secgw / parser.c

diff --git a/ceph/src/spdk/dpdk/examples/ipsec-secgw/parser.c b/ceph/src/spdk/dpdk/examples/ipsec-secgw/parser.c
index b0a8ee23b309f91b24957d1426c768d9fbe35a90..65eb7e9e2ffd8009f4de08c069d8d944a614a936 100644 (file)
--- a/ceph/src/spdk/dpdk/examples/ipsec-secgw/parser.c
+++ b/ceph/src/spdk/dpdk/examples/ipsec-secgw/parser.c
@@ -324,7 +324,7 @@ parse_uint8x16(const char *s, uint8_t *v, uint8_t ls)
 }
 
 static int
-parse_mac(const char *str, struct ether_addr *addr)
+parse_mac(const char *str, struct rte_ether_addr *addr)
 {
        uint32_t i;
 
@@ -499,7 +499,7 @@ cfg_parse_neigh(void *parsed_result, __rte_unused struct cmdline *cl,
        int32_t rc;
        struct cfg_neigh_add_item *res;
        struct parse_status *st;
-       struct ether_addr mac;
+       struct rte_ether_addr mac;
 
        st = data;
        res = parsed_result;
@@ -642,6 +642,10 @@ parse_cfg_file(const char *cfg_filename)
        cmdline_stdin_exit(cl);
        fclose(f);
 
+       sa_sort_arr();
+       sp4_sort_arr();
+       sp6_sort_arr();
+
        return 0;
 
 error_exit: