vmxnet3: move to drivers/net/

Move vmxnet3 PMD to drivers/net directory.
As part of the move, rename the "vmxnet3" subdirectory, containing the
original FreeBSD drivers, from "vmxnet3" to the more standard name
"base", to indicate it contains the base drivers used for the
implementation.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: John McNamara <john.mcnamara@intel.com>
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>

MAINTAINERS

@@ -250,7 +250,7 @@ F: doc/guides/sample_app_ug/vhost.rst
 
 VMware vmxnet3
 M: Yong Wang <yongwang@vmware.com>
-F: lib/librte_pmd_vmxnet3/
+F: drivers/net/vmxnet3/
 F: doc/guides/nics/vmxnet3.rst
 
 PCAP PMD

doc/guides/prog_guide/source_org.rst

@@ -79,7 +79,6 @@ The lib directory contains::
     +-- librte_mempool      # memory pool manager (fixedsized objects)
     +-- librte_meter        # QoS metering library
     +-- librte_net          # various IP-related headers
-    +-- librte_pmd_vmxnet3  # VMXNET3 poll mode driver
     +-- librte_pmd_xenvirt  # Xen virtio poll mode driver
     +-- librte_power        # power management library
     +-- librte_ring         # software rings (act as lockless FIFOs)
@@ -109,6 +108,7 @@ The drivers directory has a net subdirectory which contains::
     +-- pcap               # PCAP poll mode driver
     +-- ring               # ring poll mode driver
     +-- virtio             # virtio poll mode driver
+    +-- vmxnet3            # VMXNET3 poll mode driver
 
 Applications
 ------------

drivers/net/Makefile

@@ -43,6 +43,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += null
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += pcap
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_RING) += ring
 DIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio
+DIRS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += vmxnet3
 
 include $(RTE_SDK)/mk/rte.sharelib.mk
 include $(RTE_SDK)/mk/rte.subdir.mk

drivers/net/vmxnet3/Makefile

@@ -1,6 +1,6 @@
 #   BSD LICENSE
 #
-#   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+#   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
 #   All rights reserved.
 #
 #   Redistribution and use in source and binary forms, with or without
@@ -64,7 +64,7 @@ CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args
 
 endif
 
-VPATH += $(SRCDIR)/vmxnet3
+VPATH += $(SRCDIR)/base
 
 EXPORT_MAP := rte_pmd_vmxnet3_version.map
 

drivers/net/vmxnet3/vmxnet3_ethdev.c

@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -61,7 +61,7 @@
 #include <rte_malloc.h>
 #include <rte_dev.h>
 
-#include "vmxnet3/vmxnet3_defs.h"
+#include "base/vmxnet3_defs.h"
 
 #include "vmxnet3_ring.h"
 #include "vmxnet3_logs.h"

drivers/net/vmxnet3/vmxnet3_rxtx.c

@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -71,7 +71,7 @@
 #include <rte_string_fns.h>
 #include <rte_errno.h>
 
-#include "vmxnet3/vmxnet3_defs.h"
+#include "base/vmxnet3_defs.h"
 #include "vmxnet3_ring.h"
 
 #include "vmxnet3_logs.h"

lib/Makefile

@@ -41,7 +41,6 @@ DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += librte_timer
 DIRS-$(CONFIG_RTE_LIBRTE_CFGFILE) += librte_cfgfile
 DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline
 DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ether
-DIRS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += librte_pmd_vmxnet3
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += librte_pmd_xenvirt
 DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += librte_vhost
 DIRS-$(CONFIG_RTE_LIBRTE_HASH) += librte_hash