Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 904af04d authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

ipv6: route: extend flow representation with tunnel key 



Use flowi_tunnel in flowi6 similarly to what is done with IPv4.
This complements commit 1b7179d3 ("route: Extend flow representation
with tunnel key").

Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a725e514

include/net/flow.h

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ struct flowi6 { 
#define flowi6_proto		__fl_common.flowic_proto

#define flowi6_flags		__fl_common.flowic_flags

#define flowi6_secid		__fl_common.flowic_secid

#define flowi6_tun_key		__fl_common.flowic_tun_key

	struct in6_addr		daddr;

	struct in6_addr		saddr;

	__be32			flowlabel;

net/ipv6/route.c

+6 −0
Original line number Diff line number Diff line
@@ -54,11 +54,13 @@ 
#include <net/tcp.h>

#include <linux/rtnetlink.h>

#include <net/dst.h>

#include <net/dst_metadata.h>

#include <net/xfrm.h>

#include <net/netevent.h>

#include <net/netlink.h>

#include <net/nexthop.h>

#include <net/lwtunnel.h>

#include <net/ip_tunnels.h>



#include <asm/uaccess.h>
@@ -1131,6 +1133,7 @@ void ip6_route_input(struct sk_buff *skb) 
	const struct ipv6hdr *iph = ipv6_hdr(skb);

	struct net *net = dev_net(skb->dev);

	int flags = RT6_LOOKUP_F_HAS_SADDR;

	struct ip_tunnel_info *tun_info;

	struct flowi6 fl6 = {

		.flowi6_iif = skb->dev->ifindex,

		.daddr = iph->daddr,
@@ -1140,6 +1143,9 @@ void ip6_route_input(struct sk_buff *skb) 
		.flowi6_proto = iph->nexthdr,

	};



	tun_info = skb_tunnel_info(skb);

	if (tun_info && tun_info->mode == IP_TUNNEL_INFO_RX)

		fl6.flowi6_tun_key.tun_id = tun_info->key.tun_id;

	skb_dst_drop(skb);

	skb_dst_set(skb, ip6_route_input_lookup(net, skb->dev, &fl6, flags));

}