diff --git a/[refs] b/[refs]
index 999fb6d82fa0..3dc51c93f6dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60cad5da5791ceb0beefe9a79b570cca45791f50
+refs/heads/master: e4883014f48f8c17c17a2526cb5cb6e17c5f94e7
diff --git a/trunk/include/net/icmp.h b/trunk/include/net/icmp.h
index 05f8ff7d9316..dc09474efcf3 100644
--- a/trunk/include/net/icmp.h
+++ b/trunk/include/net/icmp.h
@@ -38,7 +38,7 @@ struct dst_entry;
 struct net_proto_family;
 struct sk_buff;
 
-extern void	icmp_send(struct sk_buff *skb_in,  int type, int code, u32 info);
+extern void	icmp_send(struct sk_buff *skb_in,  int type, int code, __be32 info);
 extern int	icmp_rcv(struct sk_buff *skb);
 extern int	icmp_ioctl(struct sock *sk, int cmd, unsigned long arg);
 extern void	icmp_init(struct net_proto_family *ops);
diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c
index 428f1c91ec45..45396c53560d 100644
--- a/trunk/net/ipv4/icmp.c
+++ b/trunk/net/ipv4/icmp.c
@@ -430,7 +430,7 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb)
  *			MUST reply to only the first fragment.
  */
 
-void icmp_send(struct sk_buff *skb_in, int type, int code, u32 info)
+void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
 {
 	struct iphdr *iph;
 	int room;