datapath: Move tun_key out of struct phy and union.

[openvswitch] / datapath / flow.h

diff --git a/datapath/flow.h b/datapath/flow.h
index 8bc6db6f64430d3a5a6afb69808e404c2d18dd60..54f0fcdc0f4d4a6d5a461e170fe511988a8b6ae2 100644 (file)
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -41,10 +41,8 @@ struct sw_flow_actions {
 };
 
 struct sw_flow_key {
+       struct ovs_key_ipv4_tunnel tun_key;  /* Encapsulating tunnel key. */
        struct {
-               union {
-                       struct ovs_key_ipv4_tunnel tun_key;  /* Encapsulating tunnel key. */
-               } tun;
                u32     priority;       /* Packet QoS priority. */
                u16     in_port;        /* Input switch port (or DP_MAX_PORTS). */
        } phy;