diff options
| author | David S. Miller <davem@davemloft.net> | 2021-03-12 03:09:21 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-03-12 03:09:21 +0300 |
| commit | 1d5d0a078672d36fa958ca3495c66d399c1808b9 (patch) | |
| tree | cd0cfd847e6d908432daa4b968977f5de9c656bc /include | |
| parent | 6c6095214a6c3d822d9b2561eccf8ee52e91107b (diff) | |
| parent | fbbc5bc2ab8c525f4aba4346249e3adc52d8e2c0 (diff) | |
| download | linux-1d5d0a078672d36fa958ca3495c66d399c1808b9.tar.xz | |
Merge branch 'seg6-next'
Julien Massonneau says:
====================
SRv6: SRH processing improvements
Add support for IPv4 decapsulation in ipv6_srh_rcv() and
ignore routing header with segments left equal to 0 for
seg6local actions that doesn't perfom decapsulation.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ipv6.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index bd1f396cc9c7..448bf2b34759 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -30,6 +30,7 @@ */ #define NEXTHDR_HOP 0 /* Hop-by-hop option header. */ +#define NEXTHDR_IPV4 4 /* IPv4 in IPv6 */ #define NEXTHDR_TCP 6 /* TCP segment. */ #define NEXTHDR_UDP 17 /* UDP message. */ #define NEXTHDR_IPV6 41 /* IPv6 in IPv6 */ |