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.
Showing the changes to tools/include/uapi/linux (1 of 416 files). Show all
Unified · Split
| @@ -74,6 +74,8 @@ enum { · 73 unmodified lines | |||
| 74 | #define IPPROTO_UDPLITE IPPROTO_UDPLITE | 74 | #define IPPROTO_UDPLITE IPPROTO_UDPLITE |
| 75 | IPPROTO_MPLS = 137, /* MPLS in IP (RFC 4023) */ | 75 | IPPROTO_MPLS = 137, /* MPLS in IP (RFC 4023) */ |
| 76 | #define IPPROTO_MPLS IPPROTO_MPLS | 76 | #define IPPROTO_MPLS IPPROTO_MPLS |
| 77 | IPPROTO_ETHERNET = 143, /* Ethernet-within-IPv6 Encapsulation */ | ||
| 78 | #define IPPROTO_ETHERNET IPPROTO_ETHERNET | ||
| 77 | IPPROTO_RAW = 255, /* Raw IP packets */ | 79 | IPPROTO_RAW = 255, /* Raw IP packets */ |
| 78 | #define IPPROTO_RAW IPPROTO_RAW | 80 | #define IPPROTO_RAW IPPROTO_RAW |
| 79 | IPPROTO_MPTCP = 262, /* Multipath TCP connection */ | 81 | IPPROTO_MPTCP = 262, /* Multipath TCP connection */ |