route: move lwtunnel state to dst_entry

Currently, the lwtunnel state resides in per-protocol data. This is
a problem if we encapsulate ipv6 traffic in an ipv4 tunnel (or vice versa).
The xmit function of the tunnel does not know whether the packet has been
routed to it by ipv4 or ipv6, yet it needs the lwtstate data. Moving the
lwtstate data to dst_entry makes such inter-protocol tunneling possible.

As a bonus, this brings a nice diffstat.

Signed-off-by: Jiri Benc <jbenc@redhat.com>
Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index dbeffe789185d7bf115abc8372fea919948af938..b3d9c5546c795768a7982092b23063a36b7749d9 100644 (file)
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -295,7 +295,6 @@ static struct rtable *vrf_rtable_create(struct net_device *dev)
                rth->rt_uses_gateway = 0;
                INIT_LIST_HEAD(&rth->rt_uncached);
                rth->rt_uncached_list = NULL;
-               rth->rt_lwtstate = NULL;
        }
 
        return rth;

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index ebeb3def06c541d5af5e95d90d5cf2211ea2e1de..93613ffd8d7efd2ff9becd297b628dd736d4d132 100644 (file)
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1909,7 +1909,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,
        u32 flags = vxlan->flags;
 
        /* FIXME: Support IPv6 */
-       info = skb_tunnel_info(skb, AF_INET);
+       info = skb_tunnel_info(skb);
 
        if (rdst) {
                dst_port = rdst->remote_port ? rdst->remote_port : vxlan->cfg.dst_port;
@@ -2105,7 +2105,7 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
        struct vxlan_fdb *f;
 
        /* FIXME: Support IPv6 */
-       info = skb_tunnel_info(skb, AF_INET);
+       info = skb_tunnel_info(skb);
 
        skb_reset_mac_header(skb);
        eth = eth_hdr(skb);

diff --cc include/net/dst.h
Simple merge

diff --cc include/net/dst_metadata.h
Simple merge

diff --cc include/net/ip6_fib.h
Simple merge

diff --cc include/net/lwtunnel.h
Simple merge

diff --cc include/net/route.h
Simple merge

diff --cc net/core/dst.c
Simple merge

diff --cc net/core/filter.c
Simple merge

diff --cc net/core/lwtunnel.c
Simple merge

diff --cc net/ipv4/ip_gre.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv6/ila.c
Simple merge

diff --cc net/ipv6/ip6_fib.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/mpls/mpls_iptunnel.c
Simple merge

diff --cc net/openvswitch/vport-netdev.c
Simple merge