diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 08:45:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 08:45:08 -0400 |
| commit | 59458f40e25915a355d8b1d701425fe9f4f9ea23 (patch) | |
| tree | f1c9a2934df686e36d75f759ab7313b6f0e0e5f9 /include/net/icmp.h | |
| parent | 825f9075d74028d11d7f5932f04e1b5db3022b51 (diff) | |
| parent | d834c16516d1ebec4766fc58c059bf01311e6045 (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'include/net/icmp.h')
| -rw-r--r-- | include/net/icmp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/icmp.h b/include/net/icmp.h index 05f8ff7d9316..dc09474efcf3 100644 --- a/include/net/icmp.h +++ b/include/net/icmp.h | |||
| @@ -38,7 +38,7 @@ struct dst_entry; | |||
| 38 | struct net_proto_family; | 38 | struct net_proto_family; |
| 39 | struct sk_buff; | 39 | struct sk_buff; |
| 40 | 40 | ||
| 41 | extern void icmp_send(struct sk_buff *skb_in, int type, int code, u32 info); | 41 | extern void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info); |
| 42 | extern int icmp_rcv(struct sk_buff *skb); | 42 | extern int icmp_rcv(struct sk_buff *skb); |
| 43 | extern int icmp_ioctl(struct sock *sk, int cmd, unsigned long arg); | 43 | extern int icmp_ioctl(struct sock *sk, int cmd, unsigned long arg); |
| 44 | extern void icmp_init(struct net_proto_family *ops); | 44 | extern void icmp_init(struct net_proto_family *ops); |