diff --git a/[refs] b/[refs]
index 50dc4348d5ba..953a0c916189 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32ab5f80334fc067386c4c56c434010c01cff6b9
+refs/heads/master: d9cd66e0e593929077b5ecf87384e23db7271c6e
diff --git a/trunk/include/net/ip_mp_alg.h b/trunk/include/net/ip_mp_alg.h
index ac747b64734c..beffdd66ad74 100644
--- a/trunk/include/net/ip_mp_alg.h
+++ b/trunk/include/net/ip_mp_alg.h
@@ -17,7 +17,7 @@ struct ip_mp_alg_ops {
 	void	(*mp_alg_select_route)(const struct flowi *flp,
 				       struct rtable *rth, struct rtable **rp);
 	void	(*mp_alg_flush)(void);
-	void	(*mp_alg_set_nhinfo)(__u32 network, __u32 netmask,
+	void	(*mp_alg_set_nhinfo)(__be32 network, __be32 netmask,
 				     unsigned char prefixlen,
 				     const struct fib_nh *nh);
 	void	(*mp_alg_remove)(struct rtable *rth);
@@ -59,7 +59,7 @@ static inline void multipath_flush(void)
 }
 
 static inline void multipath_set_nhinfo(struct rtable *rth,
-					__u32 network, __u32 netmask,
+					__be32 network, __be32 netmask,
 					unsigned char prefixlen,
 					const struct fib_nh *nh)
 {
diff --git a/trunk/net/ipv4/multipath_wrandom.c b/trunk/net/ipv4/multipath_wrandom.c
index d25ec4ae09e5..773acc9ccd7c 100644
--- a/trunk/net/ipv4/multipath_wrandom.c
+++ b/trunk/net/ipv4/multipath_wrandom.c
@@ -217,8 +217,8 @@ static void wrandom_select_route(const struct flowi *flp,
 	*rp = decision;
 }
 
-static void wrandom_set_nhinfo(__u32 network,
-			       __u32 netmask,
+static void wrandom_set_nhinfo(__be32 network,
+			       __be32 netmask,
 			       unsigned char prefixlen,
 			       const struct fib_nh *nh)
 {