---

yaml --- r: 36847 b: refs/heads/master c: 0579016 h: refs/heads/master i: 36845: d63d297 36843: 62c4e6e 36839: 933f3ff 36831: 4095fe8 v: v3
git-mirror · Sep 29, 2006 · d2f8039 · d2f8039
1 parent f30307a
commit d2f8039
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc939d37349bf82891bd1f4558284d7fafe7acb2
+refs/heads/master: 0579016ec4691116f6322ec6ed7fb7ce746948e9
diff --git a/trunk/include/net/ip.h b/trunk/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/trunk/net/ipv4/ip_sockglue.c b/trunk/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;