[dpdk-dev,v3,01/19] kni: move externs to the header file

Message ID 20160926153938.7575-2-ferruh.yigit@intel.com
State Accepted, archived
Delegated to: Ferruh Yigit
Headers show

Commit Message

Ferruh Yigit Sept. 26, 2016, 3:39 p.m.
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>

keep variable externs in .c file
 lib/librte_eal/linuxapp/kni/kni_dev.h   | 11 +++++++++++
 lib/librte_eal/linuxapp/kni/kni_misc.c  | 14 ++------------
 lib/librte_eal/linuxapp/kni/kni_vhost.c | 11 +----------
 3 files changed, 14 insertions(+), 22 deletions(-)


diff --git a/lib/librte_eal/linuxapp/kni/kni_dev.h b/lib/librte_eal/linuxapp/kni/kni_dev.h
index 4a4a8e1..9128523 100644
--- a/lib/librte_eal/linuxapp/kni/kni_dev.h
+++ b/lib/librte_eal/linuxapp/kni/kni_dev.h
@@ -140,6 +140,17 @@  struct kni_vhost_queue {
+void kni_net_rx(struct kni_dev *kni);
+void kni_net_init(struct net_device *dev);
+void kni_net_config_lo_mode(char *lo_str);
+void kni_net_poll_resp(struct kni_dev *kni);
+void kni_set_ethtool_ops(struct net_device *netdev);
+int ixgbe_kni_probe(struct pci_dev *pdev, struct net_device **lad_dev);
+void ixgbe_kni_remove(struct pci_dev *pdev);
+int igb_kni_probe(struct pci_dev *pdev, struct net_device **lad_dev);
+void igb_kni_remove(struct pci_dev *pdev);
 	#define KNI_DBG_RX(args...) printk(KERN_DEBUG "KNI RX: " args)
diff --git a/lib/librte_eal/linuxapp/kni/kni_misc.c b/lib/librte_eal/linuxapp/kni/kni_misc.c
index 47b730c..113fc20 100644
--- a/lib/librte_eal/linuxapp/kni/kni_misc.c
+++ b/lib/librte_eal/linuxapp/kni/kni_misc.c
@@ -48,18 +48,8 @@  MODULE_DESCRIPTION("Kernel Module for managing kni devices");
 #define KNI_MAX_DEVICES 32
-extern void kni_net_rx(struct kni_dev *kni);
-extern void kni_net_init(struct net_device *dev);
-extern void kni_net_config_lo_mode(char *lo_str);
-extern void kni_net_poll_resp(struct kni_dev *kni);
-extern void kni_set_ethtool_ops(struct net_device *netdev);
-extern int ixgbe_kni_probe(struct pci_dev *pdev, struct net_device **lad_dev);
-extern void ixgbe_kni_remove(struct pci_dev *pdev);
-extern struct pci_device_id ixgbe_pci_tbl[];
-extern int igb_kni_probe(struct pci_dev *pdev, struct net_device **lad_dev);
-extern void igb_kni_remove(struct pci_dev *pdev);
-extern struct pci_device_id igb_pci_tbl[];
+extern const struct pci_device_id ixgbe_pci_tbl[];
+extern const struct pci_device_id igb_pci_tbl[];
 static int kni_open(struct inode *inode, struct file *file);
 static int kni_release(struct inode *inode, struct file *file);
diff --git a/lib/librte_eal/linuxapp/kni/kni_vhost.c b/lib/librte_eal/linuxapp/kni/kni_vhost.c
index a3ca849..7aed96e 100644
--- a/lib/librte_eal/linuxapp/kni/kni_vhost.c
+++ b/lib/librte_eal/linuxapp/kni/kni_vhost.c
@@ -32,6 +32,7 @@ 
 #include <linux/sched.h>
 #include <linux/if_tun.h>
 #include <linux/version.h>
+#include <linux/file.h>
 #include "compat.h"
 #include "kni_dev.h"
@@ -39,17 +40,7 @@ 
 #define RX_BURST_SZ 4
-extern void put_unused_fd(unsigned int fd);
-extern struct file*
-sock_alloc_file(struct socket *sock,
-		int flags, const char *dname);
-extern int get_unused_fd_flags(unsigned flags);
-extern void fd_install(unsigned int fd, struct file *file);
 static int kni_sock_map_fd(struct socket *sock)
 	struct file *file;