diff options
| author | Con Kolivas <kernel@kolivas.org> | 2016-12-12 10:56:17 +1100 |
|---|---|---|
| committer | Con Kolivas <kernel@kolivas.org> | 2016-12-12 10:56:17 +1100 |
| commit | c3e1d5cbf048128fa788513fbc5fa3036c85fcb0 (patch) | |
| tree | 4b2b38cc960963abc48b2e30c6e2415ee383c98d /include/uapi/linux/if.h | |
| parent | e4d2e01f84338d948be51202038842fe3e0f6ce9 (diff) | |
| parent | 69973b830859bc6529a7a0468ba0d80ee5117826 (diff) | |
Merge tag 'v4.9' into 4.9-muqss4.9-muqss-150
Linux 4.9
Diffstat (limited to 'include/uapi/linux/if.h')
| -rw-r--r-- | include/uapi/linux/if.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/if.h b/include/uapi/linux/if.h index e601c8c3bdc7..1158a043342a 100644 --- a/include/uapi/linux/if.h +++ b/include/uapi/linux/if.h @@ -31,7 +31,7 @@ #include <linux/hdlc/ioctl.h> /* For glibc compatibility. An empty enum does not compile. */ -#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 && \ +#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 || \ __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 /** * enum net_device_flags - &struct net_device flags @@ -99,7 +99,7 @@ enum net_device_flags { IFF_ECHO = 1<<18, /* volatile */ #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ }; -#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 && __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 */ +#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 || __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 */ /* for compatibility with glibc net/if.h */ #if __UAPI_DEF_IF_NET_DEVICE_FLAGS |