History

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

Overlapping header include additions in macsec.c A bug fix in 'net' overlapping with the removal of 'version' string in ena_netdev.c Overlapping test additions in selftests Makefile Overlapping PCI ID table adjustments in iwlwifi driver.

David S. Miller committed 6 years ago

Commit 9fb16952 parents 1f074e6 1b649e0416 files · +4242 −1919Browse files

Showing the changes to tools/include/uapi (2 of 416 files). Show all

Unified · Split

2 files
  1. tools/include/uapi/asm/errno.h +7 −7
  2. tools/include/uapi/linux/in.h +2 −0
tools/include/uapi/asm/errno.h+7−7
@@ -1,18 +1,18 @@
11 /* SPDX-License-Identifier: GPL-2.0 */
22 #if defined(__i386__) || defined(__x86_64__)
3−#include "../../arch/x86/include/uapi/asm/errno.h"
3+#include "../../../arch/x86/include/uapi/asm/errno.h"
44 #elif defined(__powerpc__)
5−#include "../../arch/powerpc/include/uapi/asm/errno.h"
5+#include "../../../arch/powerpc/include/uapi/asm/errno.h"
66 #elif defined(__sparc__)
7−#include "../../arch/sparc/include/uapi/asm/errno.h"
7+#include "../../../arch/sparc/include/uapi/asm/errno.h"
88 #elif defined(__alpha__)
9−#include "../../arch/alpha/include/uapi/asm/errno.h"
9+#include "../../../arch/alpha/include/uapi/asm/errno.h"
1010 #elif defined(__mips__)
11−#include "../../arch/mips/include/uapi/asm/errno.h"
11+#include "../../../arch/mips/include/uapi/asm/errno.h"
1212 #elif defined(__ia64__)
13−#include "../../arch/ia64/include/uapi/asm/errno.h"
13+#include "../../../arch/ia64/include/uapi/asm/errno.h"
1414 #elif defined(__xtensa__)
15−#include "../../arch/xtensa/include/uapi/asm/errno.h"
15+#include "../../../arch/xtensa/include/uapi/asm/errno.h"
1616 #else
1717 #include <asm-generic/errno.h>
1818 #endif
tools/include/uapi/linux/in.h+2−0
@@ -74,6 +74,8 @@ enum { · 73 unmodified lines
7474 #define IPPROTO_UDPLITE IPPROTO_UDPLITE
7575 IPPROTO_MPLS = 137, /* MPLS in IP (RFC 4023) */
7676 #define IPPROTO_MPLS IPPROTO_MPLS
77+ IPPROTO_ETHERNET = 143, /* Ethernet-within-IPv6 Encapsulation */
78+#define IPPROTO_ETHERNET IPPROTO_ETHERNET
7779 IPPROTO_RAW = 255, /* Raw IP packets */
7880 #define IPPROTO_RAW IPPROTO_RAW
7981 IPPROTO_MPTCP = 262, /* Multipath TCP connection */