2008-03-03 13:22:46

by Arnd Hannemann

Subject: [PATCH] Removing unneeded statement from tcp_ipv4.c

Avoid setting tstamp_ok because this is done two lines later anyway.

Signed-off-by: Arnd Hannemann <[email protected]>

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 00156bf..a28c4c2 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1302,15 +1302,14 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
tmp_opt.saw_tstamp = 0;
}

- if (tmp_opt.saw_tstamp && !tmp_opt.rcv_tsval) {
+ if (tmp_opt.saw_tstamp && !tmp_opt.rcv_tsval)
/* Some OSes (unknown ones, but I see them on web server, which
* contains information interesting only for windows'
* users) do not send their stamp in SYN. It is easy case.
* We simply do not advertise TS support.
*/
tmp_opt.saw_tstamp = 0;
- tmp_opt.tstamp_ok = 0;
- }
+
tmp_opt.tstamp_ok = tmp_opt.saw_tstamp;

tcp_openreq_init(req, &tmp_opt, skb);

2008-03-03 14:08:32

by Ilpo Järvinen

Subject: Re: [PATCH] Removing unneeded statement from tcp_ipv4.c

On Mon, 3 Mar 2008, Arnd Hannemann wrote:

> Avoid setting tstamp_ok because this is done two lines later anyway.
>
> Signed-off-by: Arnd Hannemann <[email protected]>
>
> diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
> index 00156bf..a28c4c2 100644
> --- a/net/ipv4/tcp_ipv4.c
> +++ b/net/ipv4/tcp_ipv4.c
> @@ -1302,15 +1302,14 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
> tmp_opt.saw_tstamp = 0;
> }
>
> - if (tmp_opt.saw_tstamp && !tmp_opt.rcv_tsval) {
> + if (tmp_opt.saw_tstamp && !tmp_opt.rcv_tsval)
> /* Some OSes (unknown ones, but I see them on web server, which
> * contains information interesting only for windows'
> * users) do not send their stamp in SYN. It is easy case.
> * We simply do not advertise TS support.
> */
> tmp_opt.saw_tstamp = 0;
> - tmp_opt.tstamp_ok = 0;
> - }
> +

Please move the comment before the if (), only then can you remove those
braces safely (without affecting readability, etc.).

> tmp_opt.tstamp_ok = tmp_opt.saw_tstamp;
>
> tcp_openreq_init(req, &tmp_opt, skb);

--
i.

2008-03-03 18:51:32

by David Miller

Subject: Re: [PATCH] Removing unneeded statement from tcp_ipv4.c

From: Arnd Hannemann <[email protected]>
Date: Mon, 03 Mar 2008 14:23:38 +0100

> - if (tmp_opt.saw_tstamp && !tmp_opt.rcv_tsval) {
> + if (tmp_opt.saw_tstamp && !tmp_opt.rcv_tsval)
> /* Some OSes (unknown ones, but I see them on web server, which
> * contains information interesting only for windows'
> * users) do not send their stamp in SYN. It is easy case.
> * We simply do not advertise TS support.
> */
> tmp_opt.saw_tstamp = 0;
> - tmp_opt.tstamp_ok = 0;
> - }
> +

Please don't format it like this.

When there is a multi-line comment, you should still enclose
the basic block in braces. It's unreadable otherwise.

2008-03-03 23:17:22

by Arnd Hannemann

Subject: [PATCH-RESEND] Removing unneeded statement from tcp_ipv4.c

Ilpo J?rvinen schrieb:
> On Mon, 3 Mar 2008, Arnd Hannemann wrote:
>
>> Avoid setting tstamp_ok because this is done two lines later anyway.
>>
>> Signed-off-by: Arnd Hannemann <[email protected]>
>>
>> diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
>> index 00156bf..a28c4c2 100644
>> --- a/net/ipv4/tcp_ipv4.c
>> +++ b/net/ipv4/tcp_ipv4.c
>> @@ -1302,15 +1302,14 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
>> tmp_opt.saw_tstamp = 0;
>> }
>>
>> - if (tmp_opt.saw_tstamp && !tmp_opt.rcv_tsval) {
>> + if (tmp_opt.saw_tstamp && !tmp_opt.rcv_tsval)
>> /* Some OSes (unknown ones, but I see them on web server, which
>> * contains information interesting only for windows'
>> * users) do not send their stamp in SYN. It is easy case.
>> * We simply do not advertise TS support.
>> */
>> tmp_opt.saw_tstamp = 0;
>> - tmp_opt.tstamp_ok
>
> Please move the comment before the if (), only then can you remove those
> braces safely (without affecting readability, etc.).

Avoid setting tstamp_ok because this is done two lines later anyway.

Signed-off-by: Arnd Hannemann <[email protected]>

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 00156bf..ecef356 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1302,15 +1302,14 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
tmp_opt.saw_tstamp = 0;
}

- if (tmp_opt.saw_tstamp && !tmp_opt.rcv_tsval) {
- /* Some OSes (unknown ones, but I see them on web server, which
- * contains information interesting only for windows'
- * users) do not send their stamp in SYN. It is easy case.
- * We simply do not advertise TS support.
- */
+ /* Some OSes (unknown ones, but I see them on web server, which
+ * contains information interesting only for windows'
+ * users) do not send their stamp in SYN. It is easy case.
+ * We simply do not advertise TS support.
+ */
+ if (tmp_opt.saw_tstamp && !tmp_opt.rcv_tsval)
tmp_opt.saw_tstamp = 0;
- tmp_opt.tstamp_ok = 0;
- }
+
tmp_opt.tstamp_ok = tmp_opt.saw_tstamp;

tcp_openreq_init(req, &tmp_opt, skb);

2008-03-06 03:01:07

by David Miller

Subject: Re: [PATCH-RESEND] Removing unneeded statement from tcp_ipv4.c

From: Arnd Hannemann <[email protected]>
Date: Tue, 04 Mar 2008 00:18:07 +0100

> Avoid setting tstamp_ok because this is done two lines later anyway.
>
> Signed-off-by: Arnd Hannemann <[email protected]>

Patch does not apply, your email client has corrupted the
patch by turning tabs into spaces etc.

2008-03-06 10:45:45

by Arnd Hannemann

Subject: Re: [PATCH-RESEND] Removing unneeded statement from tcp_ipv4.c

David Miller schrieb:
> From: Arnd Hannemann <[email protected]>
> Date: Tue, 04 Mar 2008 00:18:07 +0100
>
>> Avoid setting tstamp_ok because this is done two lines later anyway.
>>
>> Signed-off-by: Arnd Hannemann <[email protected]>
>
> Patch does not apply, your email client has corrupted the
> patch by turning tabs into spaces etc.
>
Sorry, this one should apply.

Avoid setting tstamp_ok because this is done two lines later anyway.

Signed-off-by: Arnd Hannemann <[email protected]>

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 00156bf..ecef356 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1302,15 +1302,14 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
tmp_opt.saw_tstamp = 0;
}

- if (tmp_opt.saw_tstamp && !tmp_opt.rcv_tsval) {
- /* Some OSes (unknown ones, but I see them on web server, which
- * contains information interesting only for windows'
- * users) do not send their stamp in SYN. It is easy case.
- * We simply do not advertise TS support.
- */
+ /* Some OSes (unknown ones, but I see them on web server, which
+ * contains information interesting only for windows'
+ * users) do not send their stamp in SYN. It is easy case.
+ * We simply do not advertise TS support.
+ */
+ if (tmp_opt.saw_tstamp && !tmp_opt.rcv_tsval)
tmp_opt.saw_tstamp = 0;
- tmp_opt.tstamp_ok = 0;
- }
+
tmp_opt.tstamp_ok = tmp_opt.saw_tstamp;

tcp_openreq_init(req, &tmp_opt, skb);