diff options
| author |   David Lebrun <david.lebrun@uclouvain.be> | 2017-08-25 09:56:44 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-08-25 17:10:23 -0700 |
| commit | 32d99d0b670299720dd0db92a974c9612c230889 (patch) | |
| tree | 339777628429f48fdb84d2a0a913e5b898e78f01 /net/ipv6/seg6_local.c | |
| parent | strparser: initialize all callbacks (diff) | |
| download | linux-dev-32d99d0b670299720dd0db92a974c9612c230889.tar.xz linux-dev-32d99d0b670299720dd0db92a974c9612c230889.zip | |
ipv6: sr: add support for ip4ip6 encapsulation
This patch enables the SRv6 encapsulation mode to carry an IPv4 payload.
All the infrastructure was already present, I just had to add a parameter
to seg6_do_srh_encap() to specify the inner packet protocol, and perform
some additional checks.
Usage example:
ip route add 1.2.3.4 encap seg6 mode encap segs fc00::1,fc00::2 dev eth0
Signed-off-by: David Lebrun <david.lebrun@uclouvain.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/seg6_local.c')
| -rw-r--r-- | net/ipv6/seg6_local.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/seg6_local.c b/net/ipv6/seg6_local.c index 147680e7a00c..609b94e970de 100644 --- a/net/ipv6/seg6_local.c +++ b/net/ipv6/seg6_local.c @@ -290,7 +290,7 @@ static int input_action_end_b6_encap(struct sk_buff *skb, skb_reset_inner_headers(skb); skb->encapsulation = 1; - err = seg6_do_srh_encap(skb, slwt->srh); + err = seg6_do_srh_encap(skb, slwt->srh, IPPROTO_IPV6); if (err) goto drop; |