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 35d7a60f9b7a12f68e30e46f0b8ab19bd06f8bd7..7d1bccbbef781f2c0064b568ee22dba135b5b87e 100644 (file)
--- 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)