diff --git a/[refs] b/[refs]
index 034e92bdefbc..4ea0d1c386f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e25d2ca6b2808c427704b01608baf0f7dea1696e
+refs/heads/master: 4b06a7cf2f3c053e7fc47ca6a4c74553e2291e24
diff --git a/trunk/include/net/ip.h b/trunk/include/net/ip.h
index b40bd2f9ed79..96030314f70b 100644
--- a/trunk/include/net/ip.h
+++ b/trunk/include/net/ip.h
@@ -364,7 +364,7 @@ extern int	ip_ra_control(struct sock *sk, unsigned char on, void (*destructor)(s
 extern int 	ip_recv_error(struct sock *sk, struct msghdr *msg, int len);
 extern void	ip_icmp_error(struct sock *sk, struct sk_buff *skb, int err, 
 			      u16 port, u32 info, u8 *payload);
-extern void	ip_local_error(struct sock *sk, int err, u32 daddr, u16 dport,
+extern void	ip_local_error(struct sock *sk, int err, __be32 daddr, u16 dport,
 			       u32 info);
 
 /* sysctl helpers - any sysctl which holds a value that ends up being
diff --git a/trunk/net/ipv4/ip_sockglue.c b/trunk/net/ipv4/ip_sockglue.c
index 2d05c4133d3e..d5ca43c0cd73 100644
--- a/trunk/net/ipv4/ip_sockglue.c
+++ b/trunk/net/ipv4/ip_sockglue.c
@@ -283,7 +283,7 @@ void ip_icmp_error(struct sock *sk, struct sk_buff *skb, int err,
 		kfree_skb(skb);
 }
 
-void ip_local_error(struct sock *sk, int err, u32 daddr, u16 port, u32 info)
+void ip_local_error(struct sock *sk, int err, __be32 daddr, u16 port, u32 info)
 {
 	struct inet_sock *inet = inet_sk(sk);
 	struct sock_exterr_skb *serr;