From 9093cd7bf450c5c7aa88b9952293c0bb89744a89 Mon Sep 17 00:00:00 2001
From: Roland Dreier <roland@purestorage.com>
Date: Sun, 10 Jun 2012 20:05:24 +0000
Subject: [PATCH] --- yaml --- r: 310758 b: refs/heads/master c:
 c5d21c4b2a7765ab0600c8426374b50eb9f4a36f h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/include/net/route.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7260c26cb400..6d359049c595 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83a27052c3376793bc879e00e6e6805d6fb7aab9
+refs/heads/master: c5d21c4b2a7765ab0600c8426374b50eb9f4a36f
diff --git a/trunk/include/net/route.h b/trunk/include/net/route.h
index ed2b78e2375d..98705468ac03 100644
--- a/trunk/include/net/route.h
+++ b/trunk/include/net/route.h
@@ -130,9 +130,9 @@ static inline struct rtable *ip_route_output(struct net *net, __be32 daddr,
 {
 	struct flowi4 fl4 = {
 		.flowi4_oif = oif,
+		.flowi4_tos = tos,
 		.daddr = daddr,
 		.saddr = saddr,
-		.flowi4_tos = tos,
 	};
 	return ip_route_output_key(net, &fl4);
 }