diff options
| author | Jiri Benc <jbenc@redhat.com> | 2015-08-20 13:56:23 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-20 15:42:36 -0700 |
| commit | c1ea5d672aaff08da337dee735dbb548e3415585 (patch) | |
| tree | 7e5e9a74d7e55be37c1ecea8c0cdeb1211791586 /net/openvswitch/vport.h | |
| parent | 376534a3d17002d608985bd67c3b0880eacadd14 (diff) | |
| download | linux-stable-c1ea5d672aaff08da337dee735dbb548e3415585.tar.gz linux-stable-c1ea5d672aaff08da337dee735dbb548e3415585.tar.bz2 linux-stable-c1ea5d672aaff08da337dee735dbb548e3415585.zip | |
ip_tunnels: add IPv6 addresses to ip_tunnel_key
Add the IPv6 addresses as an union with IPv4 ones. When using IPv4, the
newly introduced padding after the IPv4 addresses needs to be zeroed out.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/vport.h')
| -rw-r--r-- | net/openvswitch/vport.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h index 1a689c28b5a6..43d8f5a835cb 100644 --- a/net/openvswitch/vport.h +++ b/net/openvswitch/vport.h @@ -254,8 +254,8 @@ static inline struct rtable *ovs_tunnel_route_lookup(struct net *net, struct rtable *rt; memset(fl, 0, sizeof(*fl)); - fl->daddr = key->ipv4_dst; - fl->saddr = key->ipv4_src; + fl->daddr = key->u.ipv4.dst; + fl->saddr = key->u.ipv4.src; fl->flowi4_tos = RT_TOS(key->ipv4_tos); fl->flowi4_mark = mark; fl->flowi4_proto = protocol; |