doc: add patch dependency syntax to contributing guide

[dpdk.git] / kernel / linux / kni / kni_dev.h

diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h
index fb641b6..ca5f92a 100644 (file)
--- a/kernel/linux/kni/kni_dev.h
+++ b/kernel/linux/kni/kni_dev.h
@@ -32,7 +32,7 @@
 #define MBUF_BURST_SZ 32
 
 /* Default carrier state for created KNI network interfaces */
-extern uint32_t dflt_carrier;
+extern uint32_t kni_dflt_carrier;
 
 /**
  * A structure describing the private information for a kni device.
@@ -101,18 +101,8 @@ static inline phys_addr_t iova_to_phys(struct task_struct *tsk,
        offset = iova & (PAGE_SIZE - 1);
 
        /* Read one page struct info */
-#ifdef GET_USER_PAGES_REMOTE_API_V3
        ret = get_user_pages_remote(tsk, tsk->mm, iova, 1,
                                    FOLL_TOUCH, &page, NULL, NULL);
-#endif
-#ifdef GET_USER_PAGES_REMOTE_API_V2
-       ret = get_user_pages_remote(tsk, tsk->mm, iova, 1,
-                                   FOLL_TOUCH, &page, NULL);
-#endif
-#ifdef GET_USER_PAGES_REMOTE_API_V1
-       ret = get_user_pages_remote(tsk, tsk->mm, iova, 1
-                                   0, 0, &page, NULL);
-#endif
        if (ret < 0)
                return 0;