mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
ip6_tunnel: add MPLS transmit support
Add ETH_P_MPLS_UC as supported protocol. Signed-off-by: Vadim Fedorenko <vfedorenko@novek.ru> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
e7bb18e6c8
commit
6c11fbf97e
1 changed files with 6 additions and 2 deletions
|
@ -1232,6 +1232,8 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
|
||||||
ipv6_push_frag_opts(skb, &opt.ops, &proto);
|
ipv6_push_frag_opts(skb, &opt.ops, &proto);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
skb_set_inner_ipproto(skb, proto);
|
||||||
|
|
||||||
skb_push(skb, sizeof(struct ipv6hdr));
|
skb_push(skb, sizeof(struct ipv6hdr));
|
||||||
skb_reset_network_header(skb);
|
skb_reset_network_header(skb);
|
||||||
ipv6h = ipv6_hdr(skb);
|
ipv6h = ipv6_hdr(skb);
|
||||||
|
@ -1348,6 +1350,7 @@ ipxip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev,
|
||||||
fl6.flowlabel |= ip6_flowlabel(ipv6h);
|
fl6.flowlabel |= ip6_flowlabel(ipv6h);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
orig_dsfield = dsfield = ip6_tclass(t->parms.flowinfo);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1358,8 +1361,6 @@ ipxip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev,
|
||||||
if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
|
if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
skb_set_inner_ipproto(skb, protocol);
|
|
||||||
|
|
||||||
err = ip6_tnl_xmit(skb, dev, dsfield, &fl6, encap_limit, &mtu,
|
err = ip6_tnl_xmit(skb, dev, dsfield, &fl6, encap_limit, &mtu,
|
||||||
protocol);
|
protocol);
|
||||||
if (err != 0) {
|
if (err != 0) {
|
||||||
|
@ -1402,6 +1403,9 @@ ip6_tnl_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||||
goto tx_err;
|
goto tx_err;
|
||||||
ipproto = IPPROTO_IPV6;
|
ipproto = IPPROTO_IPV6;
|
||||||
break;
|
break;
|
||||||
|
case htons(ETH_P_MPLS_UC):
|
||||||
|
ipproto = IPPROTO_MPLS;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
goto tx_err;
|
goto tx_err;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue