1 files changed, 5 insertions, 1 deletions

diff --git a/include/net/flow.h b/include/net/flow.h
index a09447749e2d..da1f064a81b3 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -59,8 +59,11 @@ struct flowi4 {
 #define flowi4_proto            __fl_common.flowic_proto
 #define flowi4_flags            __fl_common.flowic_flags
 #define flowi4_secid            __fl_common.flowic_secid
-        __be32                  daddr;
+
+        /* (saddr,daddr) must be grouped, same order as in IP header */
         __be32                  saddr;
+        __be32                  daddr;
+
         union flowi_uli         uli;
 #define fl4_sport               uli.ports.sport
 #define fl4_dport               uli.ports.dport
@@ -207,6 +210,7 @@ extern struct flow_cache_object *flow_cache_lookup(
                 u8 dir, flow_resolve_t resolver, void *ctx);
 
 extern void flow_cache_flush(void);
+extern void flow_cache_flush_deferred(void);
 extern atomic_t flow_cache_genid;
 
 #endif