diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-09-27 21:34:21 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-28 21:02:09 -0400 |
commit | 35986b329f5476630cef00cc7a164ff336ec1a21 (patch) | |
tree | c9125a35a00a981b6a3daea76af8ac71042647cc | |
parent | b406313c733156c8eea7d9c1891476f400914367 (diff) |
[IPV4]: ip_icmp_error() annotations
port is net-endian
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/ip.h | 2 | ||||
-rw-r--r-- | net/ipv4/ip_sockglue.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 7e7e9731ada8..b6d95e553401 100644 --- a/include/net/ip.h +++ b/include/net/ip.h | |||
@@ -363,7 +363,7 @@ extern int ip_ra_control(struct sock *sk, unsigned char on, void (*destructor)(s | |||
363 | 363 | ||
364 | extern int ip_recv_error(struct sock *sk, struct msghdr *msg, int len); | 364 | extern int ip_recv_error(struct sock *sk, struct msghdr *msg, int len); |
365 | extern void ip_icmp_error(struct sock *sk, struct sk_buff *skb, int err, | 365 | extern void ip_icmp_error(struct sock *sk, struct sk_buff *skb, int err, |
366 | u16 port, u32 info, u8 *payload); | 366 | __be16 port, u32 info, u8 *payload); |
367 | extern void ip_local_error(struct sock *sk, int err, __be32 daddr, __be16 dport, | 367 | extern void ip_local_error(struct sock *sk, int err, __be32 daddr, __be16 dport, |
368 | u32 info); | 368 | u32 info); |
369 | 369 | ||
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 0660494196e6..4b132953bcc2 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c | |||
@@ -254,7 +254,7 @@ int ip_ra_control(struct sock *sk, unsigned char on, void (*destructor)(struct s | |||
254 | } | 254 | } |
255 | 255 | ||
256 | void ip_icmp_error(struct sock *sk, struct sk_buff *skb, int err, | 256 | void ip_icmp_error(struct sock *sk, struct sk_buff *skb, int err, |
257 | u16 port, u32 info, u8 *payload) | 257 | __be16 port, u32 info, u8 *payload) |
258 | { | 258 | { |
259 | struct inet_sock *inet = inet_sk(sk); | 259 | struct inet_sock *inet = inet_sk(sk); |
260 | struct sock_exterr_skb *serr; | 260 | struct sock_exterr_skb *serr; |