aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-09-27 18:33:40 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-28 18:02:08 -0700
commit0579016ec4691116f6322ec6ed7fb7ce746948e9 (patch)
tree9149400d6294f0a47df8aa0a4a2dd829d72011ab
parent[NET]: ip ports in struct flowi are net-endian (diff)
downloadlinux-dev-0579016ec4691116f6322ec6ed7fb7ce746948e9.tar.xz
linux-dev-0579016ec4691116f6322ec6ed7fb7ce746948e9.zip
[IPV4]: ip_local_error() annotations
port argument is net-endian Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--include/net/ip.h2
-rw-r--r--net/ipv4/ip_sockglue.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ip.h b/include/net/ip.h
index 96030314f70b..7e7e9731ada8 100644
--- a/include/net/ip.h
+++ b/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, __be32 daddr, u16 dport,
+extern void ip_local_error(struct sock *sk, int err, __be32 daddr, __be16 dport,
u32 info);
/* sysctl helpers - any sysctl which holds a value that ends up being
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index d5ca43c0cd73..0660494196e6 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/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, __be32 daddr, u16 port, u32 info)
+void ip_local_error(struct sock *sk, int err, __be32 daddr, __be16 port, u32 info)
{
struct inet_sock *inet = inet_sk(sk);
struct sock_exterr_skb *serr;