1 files changed, 8 insertions, 6 deletions

diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h
index 76e05b25f030..a9bc1c875965 100644
--- a/net/openvswitch/flow.h
+++ b/net/openvswitch/flow.h
@@ -85,6 +85,11 @@ struct sw_flow_key {
                 struct vlan_head cvlan;
                 __be16 type;            /* Ethernet frame type. */
         } eth;
+        /* Filling a hole of two bytes. */
+        u8 ct_state;
+        u8 ct_orig_proto;               /* CT original direction tuple IP
+                                         * protocol.
+                                         */
         union {
                 struct {
                         __be32 top_lse; /* top label stack entry */
@@ -96,6 +101,7 @@ struct sw_flow_key {
                         u8     frag;    /* One of OVS_FRAG_TYPE_*. */
                 } ip;
         };
+        u16 ct_zone;                    /* Conntrack zone. */
         struct {
                 __be16 src;             /* TCP/UDP/SCTP source port. */
                 __be16 dst;             /* TCP/UDP/SCTP destination port. */
@@ -138,16 +144,12 @@ struct sw_flow_key {
                 } ipv6;
         };
         struct {
-                /* Connection tracking fields. */
-                u8 state;
-                u8 orig_proto;          /* CT orig tuple IP protocol. */
-                u16 zone;
-                u32 mark;
+                /* Connection tracking fields not packed above. */
                 struct {
                         __be16 src;     /* CT orig tuple tp src port. */
                         __be16 dst;     /* CT orig tuple tp dst port. */
                 } orig_tp;
-
+                u32 mark;
                 struct ovs_key_ct_labels labels;
         } ct;