diff options
| author | Jiri Benc <jbenc@redhat.com> | 2015-10-05 13:09:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-07 04:17:59 -0700 |
| commit | 00a93babd06aaad31d23384cda576ede0f586a8c (patch) | |
| tree | 2fd12c2f928eae294ae0892e99562ac1f2d9997e /net/openvswitch/flow_table.c | |
| parent | 4917a1548ff41e53d863d6845b4da1884e4282b4 (diff) | |
| download | linux-00a93babd06aaad31d23384cda576ede0f586a8c.tar.bz2 | |
openvswitch: add tunnel protocol to sw_flow_key
Store tunnel protocol (AF_INET or AF_INET6) in sw_flow_key. This field now
also acts as an indicator whether the flow contains tunnel data (this was
previously indicated by tun_key.u.ipv4.dst being set but with IPv6 addresses
in an union with IPv4 ones this won't work anymore).
The new field was added to a hole in sw_flow_key.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/flow_table.c')
| -rw-r--r-- | net/openvswitch/flow_table.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c index f2ea83ba4763..95dbcedf0bd4 100644 --- a/net/openvswitch/flow_table.c +++ b/net/openvswitch/flow_table.c @@ -427,7 +427,7 @@ static u32 flow_hash(const struct sw_flow_key *key, static int flow_key_start(const struct sw_flow_key *key) { - if (key->tun_key.u.ipv4.dst) + if (key->tun_proto) return 0; else return rounddown(offsetof(struct sw_flow_key, phy), |