1 files changed, 8 insertions, 0 deletions

diff --git a/include/net/flow.h b/include/net/flow.h
index 8109a159d1b3..3098ae33a178 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -19,6 +19,10 @@
 
 #define LOOPBACK_IFINDEX        1
 
+struct flowi_tunnel {
+        __be64                  tun_id;
+};
+
 struct flowi_common {
         int     flowic_oif;
         int     flowic_iif;
@@ -30,6 +34,7 @@ struct flowi_common {
 #define FLOWI_FLAG_ANYSRC               0x01
 #define FLOWI_FLAG_KNOWN_NH             0x02
         __u32   flowic_secid;
+        struct flowi_tunnel flowic_tun_key;
 };
 
 union flowi_uli {
@@ -66,6 +71,7 @@ struct flowi4 {
 #define flowi4_proto            __fl_common.flowic_proto
 #define flowi4_flags            __fl_common.flowic_flags
 #define flowi4_secid            __fl_common.flowic_secid
+#define flowi4_tun_key          __fl_common.flowic_tun_key
 
         /* (saddr,daddr) must be grouped, same order as in IP header */
         __be32                  saddr;
@@ -95,6 +101,7 @@ static inline void flowi4_init_output(struct flowi4 *fl4, int oif,
         fl4->flowi4_proto = proto;
         fl4->flowi4_flags = flags;
         fl4->flowi4_secid = 0;
+        fl4->flowi4_tun_key.tun_id = 0;
         fl4->daddr = daddr;
         fl4->saddr = saddr;
         fl4->fl4_dport = dport;
@@ -165,6 +172,7 @@ struct flowi {
 #define flowi_proto     u.__fl_common.flowic_proto
 #define flowi_flags     u.__fl_common.flowic_flags
 #define flowi_secid     u.__fl_common.flowic_secid
+#define flowi_tun_key   u.__fl_common.flowic_tun_key
 } __attribute__((__aligned__(BITS_PER_LONG/8)));
 
 static inline struct flowi *flowi4_to_flowi(struct flowi4 *fl4)