[ovs-dev] [PATCH v2 1/6] datapath-windows/Netlink: Move netlink files to a new directory.

Ankur Sharma ankursharma at vmware.com
Wed Sep 3 23:32:55 UTC 2014


In this change we have created a new directory named Netlink
inside datapath-windows/ovsext/. This directory will be used to
keep all the netlink related files.

The reason we have created new directory is that for 'put' related
APIs we will be adding netlink buffer mgmt files as well. These files
will take the count of netlink related files to 5. Hence
we decided to club the netlink files in a single directory.

Signed-off-by: Ankur Sharma <ankursharma at vmware.com>
Tested-by: Ankur Sharma <ankursharma at vmware.com>
Reported-at: https://github.com/openvswitch/ovs-issues/issues/37
Acked-by: Eitan Eliahu <eliahue at vmware.com>
Acked-by: Alin Gabriel Serdean <aserdean at cloudbasesolutions.com>

---
 datapath-windows/automake.mk                         | 6 +++---
 datapath-windows/include/OvsPub.h                    | 2 +-
 datapath-windows/ovsext/{ => Netlink}/Netlink.c      | 0
 datapath-windows/ovsext/{ => Netlink}/Netlink.h      | 0
 datapath-windows/ovsext/{ => Netlink}/NetlinkProto.h | 2 +-
 datapath-windows/ovsext/ovsext.vcxproj               | 8 ++++----
 datapath-windows/ovsext/precomp.h                    | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename datapath-windows/ovsext/{ => Netlink}/Netlink.c (100%)
 rename datapath-windows/ovsext/{ => Netlink}/Netlink.h (100%)
 rename datapath-windows/ovsext/{ => Netlink}/NetlinkProto.h (99%)

diff --git a/datapath-windows/automake.mk b/datapath-windows/automake.mk
index eb59274..5ea0197 100644
--- a/datapath-windows/automake.mk
+++ b/datapath-windows/automake.mk
@@ -5,9 +5,6 @@ EXTRA_DIST += \
 	datapath-windows/Package/package.VcxProj.user \
 	datapath-windows/include/OvsDpInterfaceExt.h \
 	datapath-windows/include/OvsPub.h\
-	datapath-windows/ovsext/Netlink.c \
-	datapath-windows/ovsext/Netlink.h \
-	datapath-windows/ovsext/NetlinkProto.h \
 	datapath-windows/misc/install.cmd \
 	datapath-windows/misc/uninstall.cmd \
 	datapath-windows/ovsext.sln \
@@ -33,6 +30,9 @@ EXTRA_DIST += \
 	datapath-windows/ovsext/IpHelper.h \
 	datapath-windows/ovsext/Jhash.c \
 	datapath-windows/ovsext/Jhash.h \
+	datapath-windows/ovsext/Netlink/Netlink.c \
+	datapath-windows/ovsext/Netlink/Netlink.h \
+	datapath-windows/ovsext/Netlink/NetlinkProto.h \
 	datapath-windows/ovsext/NetProto.h \
 	datapath-windows/ovsext/Oid.c \
 	datapath-windows/ovsext/Oid.h \
diff --git a/datapath-windows/include/OvsPub.h b/datapath-windows/include/OvsPub.h
index 0446309..36814c4 100644
--- a/datapath-windows/include/OvsPub.h
+++ b/datapath-windows/include/OvsPub.h
@@ -17,7 +17,7 @@
 #ifndef __OVS_PUB_H_
 #define __OVS_PUB_H_ 1
 
-#include "../ovsext/Netlink.h"
+#include "../ovsext/Netlink/Netlink.h"
 
 #define OVS_DRIVER_MAJOR_VER 1
 #define OVS_DRIVER_MINOR_VER 0
diff --git a/datapath-windows/ovsext/Netlink.c b/datapath-windows/ovsext/Netlink/Netlink.c
similarity index 100%
rename from datapath-windows/ovsext/Netlink.c
rename to datapath-windows/ovsext/Netlink/Netlink.c
diff --git a/datapath-windows/ovsext/Netlink.h b/datapath-windows/ovsext/Netlink/Netlink.h
similarity index 100%
rename from datapath-windows/ovsext/Netlink.h
rename to datapath-windows/ovsext/Netlink/Netlink.h
diff --git a/datapath-windows/ovsext/NetlinkProto.h b/datapath-windows/ovsext/Netlink/NetlinkProto.h
similarity index 99%
rename from datapath-windows/ovsext/NetlinkProto.h
rename to datapath-windows/ovsext/Netlink/NetlinkProto.h
index 399b286..898cc84 100644
--- a/datapath-windows/ovsext/NetlinkProto.h
+++ b/datapath-windows/ovsext/Netlink/NetlinkProto.h
@@ -113,4 +113,4 @@ BUILD_ASSERT_DECL(sizeof(NL_ATTR) == 4);
 #define OVS_HDRLEN NLMSG_ALIGN(sizeof(OVS_HDR))
 #define NLA_HDRLEN ((INT) NLA_ALIGN(sizeof(NL_ATTR)))
 
-#endif /* __NETLINK_PROTO_H_ */
+#endif /* NetlinProto.h */
diff --git a/datapath-windows/ovsext/ovsext.vcxproj b/datapath-windows/ovsext/ovsext.vcxproj
index 82ab908..a5464d4 100644
--- a/datapath-windows/ovsext/ovsext.vcxproj
+++ b/datapath-windows/ovsext/ovsext.vcxproj
@@ -82,8 +82,8 @@
     <ClInclude Include="Ioctl.h" />
     <ClInclude Include="IpHelper.h" />
     <ClInclude Include="Jhash.h" />
-    <ClInclude Include="Netlink.h" />
-    <ClInclude Include="NetlinkProto.h" />
+    <ClInclude Include="Netlink/Netlink.h" />
+    <ClInclude Include="Netlink/NetlinkProto.h" />
     <ClInclude Include="NetProto.h" />
     <ClInclude Include="Oid.h" />
     <ClInclude Include="PacketIO.h" />
@@ -138,7 +138,7 @@
     <ClCompile Include="Ioctl.c" />
     <ClCompile Include="IpHelper.c" />
     <ClCompile Include="Jhash.c" />
-    <ClCompile Include="Netlink.c" />
+    <ClCompile Include="Netlink/Netlink.c" />
     <ClCompile Include="Datapath.c" />
     <ClCompile Include="Oid.c" />
     <ClCompile Include="PacketIO.c" />
@@ -168,4 +168,4 @@
     <None Exclude="@(None)" Include="*.def;*.bat;*.hpj;*.asmx" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/datapath-windows/ovsext/precomp.h b/datapath-windows/ovsext/precomp.h
index 41e3218..765075a 100644
--- a/datapath-windows/ovsext/precomp.h
+++ b/datapath-windows/ovsext/precomp.h
@@ -24,8 +24,8 @@
 #include "Types.h"
 #include "..\include\OvsPub.h"
 #include "Util.h"
-#include "Netlink.h"
-#include "NetlinkProto.h"
+#include "Netlink/Netlink.h"
+#include "Netlink/NetlinkProto.h"
 /*
  * Include openvswitch.h from userspace. Changing the location the file from
  * include/linux is pending discussion.
-- 
1.9.1




More information about the dev mailing list