Subject: Re: [PATCH] nets: clean up net/ipv4/*

From: Eric Dumazet <[email-masked]>
Date: Sun, 02 Nov 2008 19:00:51 +0100

Jianjun Kong a écrit :
> clean up net/ipv4/* about code style.
> 
> Signed-off-by: Jianjun Kong <[email-masked]>
> 
> ---
>  net/ipv4/ah4.c                  |    4 +-
>  net/ipv4/arp.c                  |   18 +++---
>  net/ipv4/devinet.c              |   10 ++--
>  net/ipv4/esp4.c                 |    4 +-
>  net/ipv4/fib_frontend.c         |   10 ++--
>  net/ipv4/fib_hash.c             |   12 ++--
>  net/ipv4/fib_semantics.c        |    8 +-
>  net/ipv4/igmp.c                 |   46 +++++++-------
>  net/ipv4/inet_connection_sock.c |    2 +-
>  net/ipv4/inetpeer.c             |    2 +-
>  net/ipv4/ip_fragment.c          |    2 +-
>  net/ipv4/ip_gre.c               |   14 ++--
>  net/ipv4/ip_input.c             |    4 +-
>  net/ipv4/ip_output.c            |    6 +-
>  net/ipv4/ip_sockglue.c          |   32 +++++-----
>  net/ipv4/ipip.c                 |    2 +-
>  net/ipv4/ipmr.c                 |  130 +++++++++++++++++++-------------------
>  net/ipv4/raw.c                  |    8 +-
>  net/ipv4/route.c                |    6 +-
>  net/ipv4/tcp.c                  |    6 +-
>  net/ipv4/tcp_ipv4.c             |   16 +++---
>  net/ipv4/tcp_minisocks.c        |    2 +-
>  net/ipv4/tcp_output.c           |    8 +-
>  net/ipv4/tcp_timer.c            |    4 +-
>  net/ipv4/tcp_yeah.c             |    4 +-
>  net/ipv4/udp.c                  |   26 ++++----
>  net/ipv4/xfrm4_policy.c         |    2 +-
>  27 files changed, 194 insertions(+), 194 deletions(-)
> 

Hello Jianun

For this kind of cleanup, you should probably base it on net-next-2.6

And on this tree, net/ipv4/udp.c already was changed, your patch wont apply.

Also, its hard to review such large patch, that easily can contain an error.

I am not sure you have to CC linux-kernel, I removed it from the list.

Thank you

> diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
> index 2095abc..45a6c7c 100644
> --- a/net/ipv4/udp.c
> +++ b/net/ipv4/udp.c
> @@ -230,22 +230,22 @@ static struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr,
>  			if (inet->rcv_saddr) {
>  				if (inet->rcv_saddr != daddr)
>  					continue;
> -				score+=2;
> +				score += 2;
>  			}
>  			if (inet->daddr) {
>  				if (inet->daddr != saddr)
>  					continue;
> -				score+=2;
> +				score += 2;
>  			}
>  			if (inet->dport) {
>  				if (inet->dport != sport)
>  					continue;
> -				score+=2;
> +				score += 2;
>  			}
>  			if (sk->sk_bound_dev_if) {
>  				if (sk->sk_bound_dev_if != dif)
>  					continue;
> -				score+=2;
> +				score += 2;
>  			}
>  			if (score == 9) {
>  				result = sk;