From: David S. Miller <davem@davemloft.net>
Date: Fri, 1 Apr 2011 01:03:35 +0000 (-0700)
Subject: net: Order ports in same order as addresses in flow objects.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9b12c75bf4d58dd85c987ee7b6a4356fdc7c1222;p=openwrt%2Fstaging%2Fblogic.git

net: Order ports in same order as addresses in flow objects.

For consistency.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/net/flow.h b/include/net/flow.h
index 37e77d66f78c..c6d5fe5ec1bf 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -26,8 +26,8 @@ struct flowi_common {
 
 union flowi_uli {
 	struct {
-		__be16	sport;
 		__be16	dport;
+		__be16	sport;
 	} ports;
 
 	struct {
@@ -36,8 +36,8 @@ union flowi_uli {
 	} icmpt;
 
 	struct {
-		__le16	sport;
 		__le16	dport;
+		__le16	sport;
 	} dnports;
 
 	__be32		spi;
@@ -86,8 +86,8 @@ static inline void flowi4_init_output(struct flowi4 *fl4, int oif,
 	fl4->flowi4_secid = 0;
 	fl4->daddr = daddr;
 	fl4->saddr = saddr;
-	fl4->fl4_sport = sport;
 	fl4->fl4_dport = dport;
+	fl4->fl4_sport = sport;
 }