From 3a838cd31ac4876280911c8f9e86c5a2d2ba4a47 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Wed, 14 Dec 2016 08:09:10 +0000
Subject: [PATCH] xlat: provide fallback definitions for NETLINK_* constants

As new constants have been added gradually over kernel releases, define
all constant values to make newer constants decoded properly when strace
is built with older kernel headers.

* xlat/netlink_protocols.in: Add default values for constants.
* net.c [!NETLINK_SOCK_DIAG && NETLINK_INET_DIAG]: Remove.
* socketutils.c: Likewise.
---
 net.c                     |  4 ----
 socketutils.c             |  4 ----
 xlat/netlink_protocols.in | 42 +++++++++++++++++++--------------------
 3 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/net.c b/net.c
index b0394630..25a359bb 100644
--- a/net.c
+++ b/net.c
@@ -80,10 +80,6 @@
 #include "xlat/socketlayers.h"
 
 #include "xlat/inet_protocols.h"
-
-#if !defined NETLINK_SOCK_DIAG && defined NETLINK_INET_DIAG
-# define NETLINK_SOCK_DIAG NETLINK_INET_DIAG
-#endif
 #include "xlat/netlink_protocols.h"
 
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
diff --git a/socketutils.c b/socketutils.c
index ff025594..d50ef831 100644
--- a/socketutils.c
+++ b/socketutils.c
@@ -38,10 +38,6 @@
 #include <linux/rtnetlink.h>
 #include "xlat/netlink_protocols.h"
 
-#if !defined NETLINK_SOCK_DIAG && defined NETLINK_INET_DIAG
-# define NETLINK_SOCK_DIAG NETLINK_INET_DIAG
-#endif
-
 #include <sys/un.h>
 #ifndef UNIX_PATH_MAX
 # define UNIX_PATH_MAX sizeof(((struct sockaddr_un *) 0)->sun_path)
diff --git a/xlat/netlink_protocols.in b/xlat/netlink_protocols.in
index 76383f3e..45116cf0 100644
--- a/xlat/netlink_protocols.in
+++ b/xlat/netlink_protocols.in
@@ -1,21 +1,21 @@
-NETLINK_ROUTE
-NETLINK_UNUSED
-NETLINK_USERSOCK
-NETLINK_FIREWALL
-NETLINK_SOCK_DIAG
-NETLINK_NFLOG
-NETLINK_XFRM
-NETLINK_SELINUX
-NETLINK_ISCSI
-NETLINK_AUDIT
-NETLINK_FIB_LOOKUP
-NETLINK_CONNECTOR
-NETLINK_NETFILTER
-NETLINK_IP6_FW
-NETLINK_DNRTMSG
-NETLINK_KOBJECT_UEVENT
-NETLINK_GENERIC
-NETLINK_SCSITRANSPORT
-NETLINK_ECRYPTFS
-NETLINK_RDMA
-NETLINK_CRYPTO
+NETLINK_ROUTE		0
+NETLINK_UNUSED		1
+NETLINK_USERSOCK	2
+NETLINK_FIREWALL	3
+NETLINK_SOCK_DIAG	4
+NETLINK_NFLOG		5
+NETLINK_XFRM		6
+NETLINK_SELINUX		7
+NETLINK_ISCSI		8
+NETLINK_AUDIT		9
+NETLINK_FIB_LOOKUP	10
+NETLINK_CONNECTOR	11
+NETLINK_NETFILTER	12
+NETLINK_IP6_FW		13
+NETLINK_DNRTMSG		14
+NETLINK_KOBJECT_UEVENT	15
+NETLINK_GENERIC		16
+NETLINK_SCSITRANSPORT	18
+NETLINK_ECRYPTFS	19
+NETLINK_RDMA		20
+NETLINK_CRYPTO		21
-- 
2.40.0