summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2014-11-24 16:14:52 (GMT)
committerThomas Haller <thaller@redhat.com>2014-11-24 17:30:21 (GMT)
commit0e13bb44b83fd04673091ae6b75e5de598ea84c3 (patch)
tree46612faebc1f6b1bd5df2eb00ba05e583e612dca
parent6bf68e60e46a6e5dca36d8f27ce9854fcbf3c9ac (diff)
downloadlibnl-0e13bb44b83fd04673091ae6b75e5de598ea84c3.zip
libnl-0e13bb44b83fd04673091ae6b75e5de598ea84c3.tar.gz
libnl-0e13bb44b83fd04673091ae6b75e5de598ea84c3.tar.bz2
idiag: reorder idiagnl.h to have deprecated functions at the top
Acked-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: Thomas Haller <thaller@redhat.com>
-rw-r--r--include/netlink/idiag/idiagnl.h21
1 files 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