History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

David S. Miller committed 9 years ago

Commit c63d3522 parents 862b3d2 bc3913a58 files · +303 −147Browse files

Showing the changes to include/uapi/linux (3 of 58 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/if.h +2 −2
  2. include/uapi/linux/netfilter/Kbuild +1 −0
  3. include/uapi/linux/tc_act/Kbuild +1 −0
include/uapi/linux/if.h+2−2
@@ -31,7 +31,7 @@ · 30 unmodified lines
31#include <linux/hdlc/ioctl.h>31#include <linux/hdlc/ioctl.h>
32 32
33/* For glibc compatibility. An empty enum does not compile. */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 __UAPI_DEF_IF_NET_DEVICE_FLAGS != 035 __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0
36/**36/**
37 * enum net_device_flags - &struct net_device flags37 * enum net_device_flags - &struct net_device flags
@@ -99,7 +99,7 @@ enum net_device_flags { · 61 unmodified lines
99 IFF_ECHO = 1<<18, /* volatile */99 IFF_ECHO = 1<<18, /* volatile */
100#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */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/* for compatibility with glibc net/if.h */104/* for compatibility with glibc net/if.h */
105#if __UAPI_DEF_IF_NET_DEVICE_FLAGS105#if __UAPI_DEF_IF_NET_DEVICE_FLAGS
include/uapi/linux/netfilter/Kbuild+1−0
@@ -5,6 +5,7 @@ header-y += nf_conntrack_ftp.h · 4 unmodified lines
5header-y += nf_conntrack_sctp.h5header-y += nf_conntrack_sctp.h
6header-y += nf_conntrack_tcp.h6header-y += nf_conntrack_tcp.h
7header-y += nf_conntrack_tuple_common.h7header-y += nf_conntrack_tuple_common.h
8header-y += nf_log.h
8header-y += nf_tables.h9header-y += nf_tables.h
9header-y += nf_tables_compat.h10header-y += nf_tables_compat.h
10header-y += nf_nat.h11header-y += nf_nat.h
include/uapi/linux/tc_act/Kbuild+1−0
@@ -12,3 +12,4 @@ header-y += tc_bpf.h · 11 unmodified lines
12header-y += tc_connmark.h12header-y += tc_connmark.h
13header-y += tc_ife.h13header-y += tc_ife.h
14header-y += tc_tunnel_key.h14header-y += tc_tunnel_key.h
15header-y += tc_skbmod.h