Showing the changes to include/uapi/linux (3 of 58 files). Show all
Unified · Split
| @@ -31,7 +31,7 @@ · 30 unmodified lines | ||
| 31 | 31 | #include <linux/hdlc/ioctl.h> |
| 32 | 32 | |
| 33 | 33 | /* For glibc compatibility. An empty enum does not compile. */ |
| 34 | −#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 && \ | |
| 34 | +#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 || \ | |
| 35 | 35 | __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 |
| 36 | 36 | /** |
| 37 | 37 | * enum net_device_flags - &struct net_device flags |
| @@ -99,7 +99,7 @@ enum net_device_flags { · 61 unmodified lines | ||
| 99 | 99 | IFF_ECHO = 1<<18, /* volatile */ |
| 100 | 100 | #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ |
| 101 | 101 | }; |
| 102 | −#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 && __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 */ | |
| 102 | +#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 || __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 */ | |
| 103 | 103 | |
| 104 | 104 | /* for compatibility with glibc net/if.h */ |
| 105 | 105 | #if __UAPI_DEF_IF_NET_DEVICE_FLAGS |
| @@ -5,6 +5,7 @@ header-y += nf_conntrack_ftp.h · 4 unmodified lines | ||
| 5 | 5 | header-y += nf_conntrack_sctp.h |
| 6 | 6 | header-y += nf_conntrack_tcp.h |
| 7 | 7 | header-y += nf_conntrack_tuple_common.h |
| 8 | +header-y += nf_log.h | |
| 8 | 9 | header-y += nf_tables.h |
| 9 | 10 | header-y += nf_tables_compat.h |
| 10 | 11 | header-y += nf_nat.h |
| @@ -12,3 +12,4 @@ header-y += tc_bpf.h · 11 unmodified lines | ||
| 12 | 12 | header-y += tc_connmark.h |
| 13 | 13 | header-y += tc_ife.h |
| 14 | 14 | header-y += tc_tunnel_key.h |
| 15 | +header-y += tc_skbmod.h | |