Skip to contentSkip to conversation

tools headers uapi: Sync linux/in.h copy from the kernel sources

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jan 8, 2019

lore
Share & tools
lore
#0 lore raw
Commit-ID:  4001b6a080aaca9a13ea07ae8972b82fdbd9ea6b
Gitweb:     https://git.kernel.org/tip/4001b6a080aaca9a13ea07ae8972b82fdbd9ea6b
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Fri, 4 Jan 2019 11:41:42 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
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

---
 tools/include/uapi/linux/in.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
tools/include/uapi/linux/in.h +7 -3
index 48e8a225b985..f6052e70bf40 100644
@@ -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)