From e907d29eef1ca25db2faacc65697838ee6fe5cd3 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 26 Sep 2006 22:17:28 -0700 Subject: [PATCH] --- yaml --- r: 36783 b: refs/heads/master c: e4883014f48f8c17c17a2526cb5cb6e17c5f94e7 h: refs/heads/master i: 36781: 14a2a44877f58753f79e71d71ee22df21dea5452 36779: 7579ca498ec062606d9fe35be2cea2617cd574cf 36775: 1acd8a01ac028a145481f77eea9e2a12f37848da 36767: 48169ce0997bac0d9d2f90d606d65cf556b44472 v: v3 --- [refs] | 2 +- trunk/include/net/icmp.h | 2 +- trunk/net/ipv4/icmp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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;