route: Per route IP tunnel metadata via lightweight tunnel

This introduces a new IP tunnel lightweight tunnel type which allows
to specify IP tunnel instructions per route. Only IPv4 is supported
at this point.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 06c092b05a51..9486d7ec128c 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1935,7 +1935,7 @@ static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,
 static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
                            struct vxlan_rdst *rdst, bool did_rsc)
 {
-        struct ip_tunnel_info *info = skb_tunnel_info(skb);
+        struct ip_tunnel_info *info;
         struct vxlan_dev *vxlan = netdev_priv(dev);
         struct sock *sk = vxlan->vn_sock->sock->sk;
         struct rtable *rt = NULL;
@@ -1952,6 +1952,9 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
         int err;
         u32 flags = vxlan->flags;
 
+        /* FIXME: Support IPv6 */
+        info = skb_tunnel_info(skb, AF_INET);
+
         if (rdst) {
                 dst_port = rdst->remote_port ? rdst->remote_port : vxlan->dst_port;
                 vni = rdst->remote_vni;
@@ -2141,12 +2144,15 @@ tx_free:
 static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct vxlan_dev *vxlan = netdev_priv(dev);
-        const struct ip_tunnel_info *info = skb_tunnel_info(skb);
+        const struct ip_tunnel_info *info;
         struct ethhdr *eth;
         bool did_rsc = false;
         struct vxlan_rdst *rdst, *fdst = NULL;
         struct vxlan_fdb *f;
 
+        /* FIXME: Support IPv6 */
+        info = skb_tunnel_info(skb, AF_INET);
+
         skb_reset_mac_header(skb);
         eth = eth_hdr(skb);