openvswitch: add tunnel protocol to sw_flow_key
authorJiri Benc <jbenc@redhat.com>
Mon, 5 Oct 2015 11:09:46 +0000 (13:09 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Oct 2015 11:17:59 +0000 (04:17 -0700)
commit00a93babd06aaad31d23384cda576ede0f586a8c
tree2fd12c2f928eae294ae0892e99562ac1f2d9997e
parent4917a1548ff41e53d863d6845b4da1884e4282b4
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>
net/openvswitch/flow.c
net/openvswitch/flow.h
net/openvswitch/flow_netlink.c
net/openvswitch/flow_table.c