diff options
| author |   Jiri Benc <jbenc@redhat.com> | 2015-08-20 13:56:25 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-08-20 15:42:36 -0700 |
| commit | 61adedf3e3f1d3f032c5a6a299978d91eff6d555 (patch) | |
| tree | b0d915083b64f9196bf90135a501779762149a9e /net/core/filter.c | |
| parent | ip_tunnels: use tos and ttl fields also for IPv6 (diff) | |
| download | linux-dev-61adedf3e3f1d3f032c5a6a299978d91eff6d555.tar.xz linux-dev-61adedf3e3f1d3f032c5a6a299978d91eff6d555.zip | |
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>
Diffstat (limited to 'net/core/filter.c')
| -rw-r--r-- | net/core/filter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index 379568562ffb..b4adc961413f 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -1489,7 +1489,7 @@ static u64 bpf_skb_get_tunnel_key(u64 r1, u64 r2, u64 size, u64 flags, u64 r5) { struct sk_buff *skb = (struct sk_buff *) (long) r1; struct bpf_tunnel_key *to = (struct bpf_tunnel_key *) (long) r2; - struct ip_tunnel_info *info = skb_tunnel_info(skb, AF_INET); + struct ip_tunnel_info *info = skb_tunnel_info(skb); if (unlikely(size != sizeof(struct bpf_tunnel_key) || flags || !info)) return -EINVAL; |