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>

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index dae6f7146b499f96c2d0157acfa95702346be893..6b94c870693c583c45263cefa4c09f7ecc58a1c8 100644 (file)
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1232,6 +1232,8 @@ route_lookup:
                ipv6_push_frag_opts(skb, &opt.ops, &proto);
        }
 
+       skb_set_inner_ipproto(skb, proto);
+
        skb_push(skb, sizeof(struct ipv6hdr));
        skb_reset_network_header(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);
                        break;
                default:
+                       orig_dsfield = dsfield = ip6_tclass(t->parms.flowinfo);
                        break;
                }
        }
@@ -1358,8 +1361,6 @@ ipxip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev,
        if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
                return -1;
 
-       skb_set_inner_ipproto(skb, protocol);
-
        err = ip6_tnl_xmit(skb, dev, dsfield, &fl6, encap_limit, &mtu,
                           protocol);
        if (err != 0) {
@@ -1402,6 +1403,9 @@ ip6_tnl_start_xmit(struct sk_buff *skb, struct net_device *dev)
                        goto tx_err;
                ipproto = IPPROTO_IPV6;
                break;
+       case htons(ETH_P_MPLS_UC):
+               ipproto = IPPROTO_MPLS;
+               break;
        default:
                goto tx_err;
        }