On 3/5/07, Arnaldo Carvalho de Melo <[EMAIL PROTECTED]> wrote:
Hi David, Stephen
Whitespace cleanups have to pass the compile test too ;-) This
is just in net-2.6.22 tho :-)
Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
There is one more problem:
- __u16 destp = ntohs(inet->dport);
- __u16 srcp = ntohs(inet->sport);
+ __u16 dest = ntohs(inet->dport);
+ __u16 srcp = ntohs(inet->sport);
It changes 'destp' to dest, and there is already a dest variable,
updated patch attached,
Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 5309dd5..45b58ab 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -196,7 +196,7 @@ gotit:
if (sk2->sk_hash == snum &&
sk2 != sk &&
(!sk2->sk_reuse || !sk->sk_reuse) &&
- || sk2->sk_bound_dev_if == sk->sk_bound_dev_if) &&
+ (sk2->sk_bound_dev_if == sk->sk_bound_dev_if) &&
(*saddr_comp)(sk, sk2))
goto fail;
}
@@ -1660,7 +1660,7 @@ static void udp4_format_sock(struct sock *sp, char *tmpbuf, int bucket)
struct inet_sock *inet = inet_sk(sp);
__be32 dest = inet->daddr;
__be32 src = inet->rcv_saddr;
- __u16 dest = ntohs(inet->dport);
+ __u16 destp = ntohs(inet->dport);
__u16 srcp = ntohs(inet->sport);
sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X"