From afa588490b7e87c5adfb05d5163074e20b6ff14a Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 13 May 2019 14:56:15 -0700 Subject: [PATCH] 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 Signed-off-by: Stephen Hemminger --- include/uapi/linux/sockios.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/uapi/linux/sockios.h b/include/uapi/linux/sockios.h index 35d7a60f..7d1bccbb 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)