[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-smghvyxb3budqd1e70i0ylw1@git.kernel.org>
Date: Tue, 8 Jan 2019 07:41:11 -0800
From: tip-bot for Arnaldo Carvalho de Melo <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: adrian.hunter@...el.com, tglx@...utronix.de, jolsa@...nel.org,
acme@...hat.com, davem@...emloft.net, linux-kernel@...r.kernel.org,
mingo@...nel.org, dave.taht@...il.com, hpa@...or.com,
namhyung@...nel.org
Subject: [tip:perf/urgent] tools headers uapi: Sync linux/in.h copy from the
kernel sources
Commit-ID: 4001b6a080aaca9a13ea07ae8972b82fdbd9ea6b
Gitweb: https://git.kernel.org/tip/4001b6a080aaca9a13ea07ae8972b82fdbd9ea6b
Author: Arnaldo Carvalho de Melo <acme@...hat.com>
AuthorDate: Fri, 4 Jan 2019 11:41:42 -0300
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Fri, 4 Jan 2019 12:54:49 -0300
tools headers uapi: Sync linux/in.h copy from the kernel sources
To get the changes in this cset:
65cab850f0ee ("net: Allow class-e address assignment via ifconfig ioctl")
The macros changed in this cset are not used in tools/, so this is just
to silence this perf tools build warning:
Warning: Kernel ABI header at 'tools/include/uapi/linux/in.h' differs from latest version at 'include/uapi/linux/in.h'
diff -u tools/include/uapi/linux/in.h include/uapi/linux/in.h
Cc: Dave Taht <dave.taht@...il.com>
Cc: David S. Miller <davem@...emloft.net>
Cc: Adrian Hunter <adrian.hunter@...el.com>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Namhyung Kim <namhyung@...nel.org>
Link: https://lkml.kernel.org/n/tip-smghvyxb3budqd1e70i0ylw1@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/include/uapi/linux/in.h | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/tools/include/uapi/linux/in.h b/tools/include/uapi/linux/in.h
index 48e8a225b985..f6052e70bf40 100644
--- a/tools/include/uapi/linux/in.h
+++ b/tools/include/uapi/linux/in.h
@@ -266,10 +266,14 @@ struct sockaddr_in {
#define IN_CLASSD(a) ((((long int) (a)) & 0xf0000000) == 0xe0000000)
#define IN_MULTICAST(a) IN_CLASSD(a)
-#define IN_MULTICAST_NET 0xF0000000
+#define IN_MULTICAST_NET 0xe0000000
-#define IN_EXPERIMENTAL(a) ((((long int) (a)) & 0xf0000000) == 0xf0000000)
-#define IN_BADCLASS(a) IN_EXPERIMENTAL((a))
+#define IN_BADCLASS(a) ((((long int) (a) ) == 0xffffffff)
+#define IN_EXPERIMENTAL(a) IN_BADCLASS((a))
+
+#define IN_CLASSE(a) ((((long int) (a)) & 0xf0000000) == 0xf0000000)
+#define IN_CLASSE_NET 0xffffffff
+#define IN_CLASSE_NSHIFT 0
/* Address to accept any incoming messages. */
#define INADDR_ANY ((unsigned long int) 0x00000000)
Powered by blists - more mailing lists