From d2f803942754bc16762c1e9cc2432c2fd565cefd Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 27 Sep 2006 18:33:40 -0700 Subject: [PATCH] --- yaml --- r: 36847 b: refs/heads/master c: 0579016ec4691116f6322ec6ed7fb7ce746948e9 h: refs/heads/master i: 36845: d63d2973e43b30c4cf9be420afb7e2e382379e4c 36843: 62c4e6efe3d7ed650d61eccd33c5848cd313720c 36839: 933f3ff242701c6b1971ccf7bea9e841f71e0a97 36831: 4095fe88c227df262972ada5aff72444c2eab454 v: v3 --- [refs] | 2 +- trunk/include/net/ip.h | 2 +- trunk/net/ipv4/ip_sockglue.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d259d8df505a..657c0ee71098 100644 --- 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 index 96030314f70b..7e7e9731ada8 100644 --- 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 index d5ca43c0cd73..0660494196e6 100644 --- 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;