diff options
| author | Jiri Benc <jbenc@redhat.com> | 2015-10-05 14:09:46 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-07 14:17:59 +0300 |
| commit | 00a93babd06aaad31d23384cda576ede0f586a8c (patch) | |
| tree | 2fd12c2f928eae294ae0892e99562ac1f2d9997e /net/openvswitch/flow.h | |
| parent | 4917a1548ff41e53d863d6845b4da1884e4282b4 (diff) | |
| download | linux-00a93babd06aaad31d23384cda576ede0f586a8c.tar.xz | |
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.h')
| -rw-r--r-- | net/openvswitch/flow.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h index fe527d2dd4b7..5688e33e2de6 100644 --- a/net/openvswitch/flow.h +++ b/net/openvswitch/flow.h @@ -63,6 +63,7 @@ struct sw_flow_key { u32 skb_mark; /* SKB mark. */ u16 in_port; /* Input switch port (or DP_MAX_PORTS). */ } __packed phy; /* Safe when right after 'tun_key'. */ + u8 tun_proto; /* Protocol of encapsulating tunnel. */ u32 ovs_flow_hash; /* Datapath computed hash value. */ u32 recirc_id; /* Recirculation ID. */ struct { |