idiag: deprecate netlink message type defines in idiagnl.h

Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Thomas Haller <thaller@redhat.com>

diff --git a/include/netlink/idiag/idiagnl.h b/include/netlink/idiag/idiagnl.h
index 58fe82ef2691dab94ec17ea84e0edbf5af7e5e41..9f3345a317e550d6646ce4b275d90d2b5f8ac827 100644 (file)
--- a/include/netlink/idiag/idiagnl.h
+++ b/include/netlink/idiag/idiagnl.h
@@ -21,6 +21,9 @@ extern "C" {
 
 /**
  * Inet Diag message types
+ *
+ * deprecated: use TCPDIAG_GETSOCK, DCCPDIAG_GETSOCK and
+ * INET_DIAG_GETSOCK_MAX from linux/inet_diag.h
  */
 #define IDIAG_TCPDIAG_GETSOCK  18
 #define IDIAG_DCCPDIAG_GETSOCK 19

diff --git a/lib/idiag/idiag_msg_obj.c b/lib/idiag/idiag_msg_obj.c
index 321d83e74a0a626fa362a54d6296220428f7e13b..00c0562b933727f1638d02d53f7e829ab0a6484d 100644 (file)
--- a/lib/idiag/idiag_msg_obj.c
+++ b/lib/idiag/idiag_msg_obj.c
@@ -71,8 +71,8 @@ static struct nl_cache_ops idiagnl_msg_ops = {
        .co_name                = "idiag/idiag",
        .co_hdrsize             = sizeof(struct inet_diag_msg),
        .co_msgtypes            = {
-               { IDIAG_TCPDIAG_GETSOCK, NL_ACT_NEW, "new" },
-               { IDIAG_DCCPDIAG_GETSOCK, NL_ACT_NEW, "new" },
+               { TCPDIAG_GETSOCK, NL_ACT_NEW, "new" },
+               { DCCPDIAG_GETSOCK, NL_ACT_NEW, "new" },
                END_OF_MSGTYPES_LIST,
        },
        .co_protocol            = NETLINK_INET_DIAG,