lib/tc: Put the tunnel match fields as part of the tc/flower key struct

[mirror_ovs.git] / lib / tc.h

diff --git a/lib/tc.h b/lib/tc.h
index aa8805df2b92cab0087de68743ebab0705bfc7ff..d935bfcbf5aba24bcabecd7d073b38d2c3417c1a 100644 (file)
--- a/lib/tc.h
+++ b/lib/tc.h
@@ -106,6 +106,22 @@ struct tc_flower_key {
         struct in6_addr ipv6_src;
         struct in6_addr ipv6_dst;
     } ipv6;
+
+    struct {
+        struct {
+            ovs_be32 ipv4_src;
+            ovs_be32 ipv4_dst;
+        } ipv4;
+        struct {
+            struct in6_addr ipv6_src;
+            struct in6_addr ipv6_dst;
+        } ipv6;
+        uint8_t tos;
+        uint8_t ttl;
+        ovs_be16 tp_src;
+        ovs_be16 tp_dst;
+        ovs_be64 id;
+    } tunnel;
 };
 
 enum tc_action_type {
@@ -173,22 +189,7 @@ struct tc_flower {
 
     uint32_t csum_update_flags;
 
-    struct {
-        bool tunnel;
-        struct {
-            ovs_be32 ipv4_src;
-            ovs_be32 ipv4_dst;
-        } ipv4;
-        struct {
-            struct in6_addr ipv6_src;
-            struct in6_addr ipv6_dst;
-        } ipv6;
-        uint8_t tos;
-        uint8_t ttl;
-        ovs_be16 tp_src;
-        ovs_be16 tp_dst;
-        ovs_be64 id;
-    } tunnel;
+    bool tunnel;
 
     struct tc_cookie act_cookie;