p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ipv6: route: extend flow representation with tunnel key 

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

Signed-off-by: Jiri Benc <jbenc@redhat.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Benc 2015-08-20 13:56:31 +02:00 committed by David S. Miller
parent a725e514db
commit 904af04d30
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/flow.h
View File

@ -130,6 +130,7 @@ struct flowi6 {
#define flowi6_proto __fl_common.flowic_proto #define flowi6_proto __fl_common.flowic_proto
#define flowi6_flags __fl_common.flowic_flags #define flowi6_flags __fl_common.flowic_flags
#define flowi6_secid __fl_common.flowic_secid #define flowi6_secid __fl_common.flowic_secid
#define flowi6_tun_key __fl_common.flowic_tun_key
struct in6_addr daddr; struct in6_addr daddr;
struct in6_addr saddr; struct in6_addr saddr;
__be32 flowlabel; __be32 flowlabel;

6
net/ipv6/route.c
View File

@ -54,11 +54,13 @@
#include <net/tcp.h> #include <net/tcp.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <net/dst.h> #include <net/dst.h>
#include <net/dst_metadata.h>
#include <net/xfrm.h> #include <net/xfrm.h>
#include <net/netevent.h> #include <net/netevent.h>
#include <net/netlink.h> #include <net/netlink.h>
#include <net/nexthop.h> #include <net/nexthop.h>
#include <net/lwtunnel.h> #include <net/lwtunnel.h>
#include <net/ip_tunnels.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
@ -1131,6 +1133,7 @@ void ip6_route_input(struct sk_buff *skb)
const struct ipv6hdr *iph = ipv6_hdr(skb); const struct ipv6hdr *iph = ipv6_hdr(skb);
struct net *net = dev_net(skb->dev); struct net *net = dev_net(skb->dev);
int flags = RT6_LOOKUP_F_HAS_SADDR; int flags = RT6_LOOKUP_F_HAS_SADDR;
struct ip_tunnel_info *tun_info;
struct flowi6 fl6 = { struct flowi6 fl6 = {
.flowi6_iif = skb->dev->ifindex, .flowi6_iif = skb->dev->ifindex,
.daddr = iph->daddr, .daddr = iph->daddr,
@ -1140,6 +1143,9 @@ void ip6_route_input(struct sk_buff *skb)
.flowi6_proto = iph->nexthdr, .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_drop(skb);
skb_dst_set(skb, ip6_route_input_lookup(net, skb->dev, &fl6, flags)); skb_dst_set(skb, ip6_route_input_lookup(net, skb->dev, &fl6, flags));
} }