Merge commit 'v3.3-rc4'

1 files changed, 10 insertions, 0 deletions

diff --git a/include/net/flow.h b/include/net/flow.h
index 9b582437fbea..6c469dbdb917 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -93,6 +93,16 @@ static inline void flowi4_init_output(struct flowi4 *fl4, int oif,
         fl4->fl4_dport = dport;
         fl4->fl4_sport = sport;
 }
+
+/* Reset some input parameters after previous lookup */
+static inline void flowi4_update_output(struct flowi4 *fl4, int oif, __u8 tos,
+                                        __be32 daddr, __be32 saddr)
+{
+        fl4->flowi4_oif = oif;
+        fl4->flowi4_tos = tos;
+        fl4->daddr = daddr;
+        fl4->saddr = saddr;
+}
                                       
 
 struct flowi6 {