[PATCH 08/13] idiag: reorder idiagnl.h to have deprecated functions at the top

[Thomas Haller]

Signed-off-by: Thomas Haller <thaller at redhat.com>
---
 include/netlink/idiag/idiagnl.h | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/include/netlink/idiag/idiagnl.h b/include/netlink/idiag/idiagnl.h
index e6bc650..c99f83b 100644
--- a/include/netlink/idiag/idiagnl.h
+++ b/include/netlink/idiag/idiagnl.h
@@ -19,6 +19,11 @@
 extern "C" {
 #endif
 
+/*************************************************************
+ * The following part contains DEPRECATED names and defines.
+ * Don't use them.
+ *************************************************************/
+
 /**
  * Inet Diag message types
  *
@@ -55,12 +60,6 @@ enum {
 /**
  * Macro to represent all socket states.
  * @ingroup idiag
- */
-#define IDIAGNL_SS_ALL (((1<<12)-1))
-
-/**
- * Macro to represent all socket states.
- * @ingroup idiag
  * @deprecated
  */
 #define IDIAG_SS_ALL  IDIAGNL_SS_ALL
@@ -90,7 +89,7 @@ enum {
 };
 
 
-/* Keep these only for compatibility, DO NOT USE THEM */
+/* deprectated keep these only for compatibility, DO NOT USE THEM */
 #define	IDIAG_SK_MEMINFO_RMEM_ALLOC SK_MEMINFO_RMEM_ALLOC
 #define	IDIAG_SK_MEMINFO_RCVBUF SK_MEMINFO_RCVBUF
 #define	IDIAG_SK_MEMINFO_WMEM_ALLOC SK_MEMINFO_WMEM_ALLOC
@@ -109,6 +108,14 @@ enum {
 #define IDIAG_TIMER_PERSIST             IDIAGNL_TIMER_PERSIST
 #define IDIAG_TIMER_UNKNOWN             IDIAGNL_TIMER_UNKNOWN
 
+/*************************************************************/
+
+/**
+ * Macro to represent all socket states.
+ * @ingroup idiag
+ */
+#define IDIAGNL_SS_ALL (((1<<12)-1))
+
 /**
  * Socket timer indentifiers
  * @ingroupd idiag
-- 
1.9.3