diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-24 10:03:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-24 10:03:32 -0700 |
| commit | 76ccd234269bd05debdbc12c96eafe62dd9a6180 (patch) | |
| tree | 248f1f62f8282bbb4e93e1ad97e9af798f05433a /tools/include | |
| parent | 3f3ee43a462344f6509bd15c988e39d330af91b3 (diff) | |
| parent | 564200ed8e71d91327d337e46bc778cee02da866 (diff) | |
| download | cachepc-linux-76ccd234269bd05debdbc12c96eafe62dd9a6180.tar.gz cachepc-linux-76ccd234269bd05debdbc12c96eafe62dd9a6180.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf tooling fixes from Ingo Molnar:
"A handful of tooling fixes all across the map, no kernel changes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tools headers uapi: Update linux/in.h copy
perf probe: Do not depend on dwfl_module_addrsym()
perf probe: Fix to delete multiple probe event
perf parse-events: Fix reading of invalid memory in event parsing
perf python: Fix clang detection when using CC=clang-version
perf map: Fix off by one in strncpy() size argument
tools: Let O= makes handle a relative path with -C option
Diffstat (limited to 'tools/include')
| -rw-r--r-- | tools/include/uapi/linux/in.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/include/uapi/linux/in.h b/tools/include/uapi/linux/in.h index 1521073b6348..8533bf07450f 100644 --- a/tools/include/uapi/linux/in.h +++ b/tools/include/uapi/linux/in.h @@ -74,6 +74,8 @@ enum { #define IPPROTO_UDPLITE IPPROTO_UDPLITE IPPROTO_MPLS = 137, /* MPLS in IP (RFC 4023) */ #define IPPROTO_MPLS IPPROTO_MPLS + IPPROTO_ETHERNET = 143, /* Ethernet-within-IPv6 Encapsulation */ +#define IPPROTO_ETHERNET IPPROTO_ETHERNET IPPROTO_RAW = 255, /* Raw IP packets */ #define IPPROTO_RAW IPPROTO_RAW IPPROTO_MPTCP = 262, /* Multipath TCP connection */ |