net/ice/base: support switch rule about VLAN PPPoE

[dpdk.git] / app / test / test_interrupts.c

diff --git a/app/test/test_interrupts.c b/app/test/test_interrupts.c
index 4e82e9a..233b14a 100644 (file)
--- a/app/test/test_interrupts.c
+++ b/app/test/test_interrupts.c
@@ -31,7 +31,7 @@ static struct rte_intr_handle intr_handles[TEST_INTERRUPT_HANDLE_MAX];
 static enum test_interrupt_handle_type test_intr_type =
                                TEST_INTERRUPT_HANDLE_MAX;
 
-#ifdef RTE_EXEC_ENV_LINUXAPP
+#ifdef RTE_EXEC_ENV_LINUX
 union intr_pipefds{
        struct {
                int pipefd[2];
@@ -169,7 +169,7 @@ test_interrupt_handle_compare(struct rte_intr_handle *intr_handle_l,
 
        return 0;
 }
-#endif /* RTE_EXEC_ENV_LINUXAPP */
+#endif /* RTE_EXEC_ENV_LINUX */
 
 /**
  * Callback for the test interrupt.
@@ -370,9 +370,13 @@ test_interrupt_full_path_check(enum test_interrupt_handle_type intr_type)
                rte_delay_ms(TEST_INTERRUPT_CHECK_INTERVAL);
 
        rte_delay_ms(TEST_INTERRUPT_CHECK_INTERVAL);
-       if (rte_intr_callback_unregister(&test_intr_handle,
-                       test_interrupt_callback, &test_intr_handle) < 0)
-               return -1;
+       while ((count =
+               rte_intr_callback_unregister(&test_intr_handle,
+                                            test_interrupt_callback,
+                                            &test_intr_handle)) < 0) {
+               if (count != -EAGAIN)
+                       return -1;
+       }
 
        if (flag == 0) {
                printf("callback has not been called\n");