From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 13 May 2019 21:56:15 +0000 (-0700)
Subject: uapi: update headers to import asm-generic/sockios.h
X-Git-Tag: v5.2.0~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afa588490b7e87c5adfb05d5163074e20b6ff14a;p=thirdparty%2Fiproute2.git

uapi: update headers to import asm-generic/sockios.h

import asm-generic/sockios.h to fix the compile errors from the
movement of timestamp macros.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---

diff --git a/include/uapi/linux/sockios.h b/include/uapi/linux/sockios.h
index 35d7a60f9..7d1bccbbe 100644
--- a/include/uapi/linux/sockios.h
+++ b/include/uapi/linux/sockios.h
@@ -39,12 +39,8 @@
 
 #if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__))
 /* on 64-bit and x32, avoid the ?: operator */
-#ifndef SIOCGSTAMP
 #define SIOCGSTAMP	SIOCGSTAMP_OLD
-#endif
-#ifndef SIOCGSTAMPNS
 #define SIOCGSTAMPNS	SIOCGSTAMPNS_OLD
-#endif
 #else
 #define SIOCGSTAMP	((sizeof(struct timeval))  == 8 ? \
 			 SIOCGSTAMP_OLD   : SIOCGSTAMP_NEW)