[PATCH] netfilter: nf_ct_tcp: Remove the duplicated word in comment

[PATCH] netfilter: nf_ct_tcp: Remove the duplicated word in comment

[Feng Gao]

[-- Attachment #1: Type: text/plain, Size: 1405 bytes --]

Hi Pablo,

To try to resolve the "git am" issue, so I start the new email
conversation. The attachment is the latest patch file.

The following is the patch content too.

>From 8844279c5e8966b57251c20c003e896f49f768ee Mon Sep 17 00:00:00 2001
From: Feng Gao <gfree.wind@gmail.com>
Date: Thu, 20 Aug 2015 08:43:26 +0800
Subject: [PATCH] netfilter: nf_ct_tcp: Remove the duplicated word in comment

Signed-off-by: Feng Gao <gfree.wind@gmail.com>
---
 net/netfilter/nf_conntrack_proto_tcp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/netfilter/nf_conntrack_proto_tcp.c
b/net/netfilter/nf_conntrack_proto_tcp.c
index 70383de..cf7b18a 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -1088,9 +1088,9 @@ static int tcp_packet(struct nf_conn *ct,
           && (old_state == TCP_CONNTRACK_SYN_RECV
               || old_state == TCP_CONNTRACK_ESTABLISHED)
           && new_state == TCP_CONNTRACK_ESTABLISHED) {
-       /* Set ASSURED if we see see valid ack in ESTABLISHED
-          after SYN_RECV or a valid answer for a picked up
-          connection. */
+       /* Set ASSURED if we see valid ack in ESTABLISHED after
+        * SYN_RECV or a valid answer for a picked up connection.
+        */
        set_bit(IPS_ASSURED_BIT, &ct->status);
        nf_conntrack_event_cache(IPCT_ASSURED, ct);
    }

Best Regards
Feng

[-- Attachment #2: 0001-netfilter-nf_ct_tcp-Remove-the-duplicated-word-in-co.patch --]
[-- Type: application/octet-stream, Size: 1170 bytes --]

From 8844279c5e8966b57251c20c003e896f49f768ee Mon Sep 17 00:00:00 2001
From: Feng Gao <gfree.wind@gmail.com>
Date: Thu, 20 Aug 2015 08:43:26 +0800
Subject: [PATCH] netfilter: nf_ct_tcp: Remove the duplicated word in comment

Signed-off-by: Feng Gao <gfree.wind@gmail.com>
---
 net/netfilter/nf_conntrack_proto_tcp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index 70383de..cf7b18a 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -1088,9 +1088,9 @@ static int tcp_packet(struct nf_conn *ct,
 		   && (old_state == TCP_CONNTRACK_SYN_RECV
 		       || old_state == TCP_CONNTRACK_ESTABLISHED)
 		   && new_state == TCP_CONNTRACK_ESTABLISHED) {
-		/* Set ASSURED if we see see valid ack in ESTABLISHED
-		   after SYN_RECV or a valid answer for a picked up
-		   connection. */
+		/* Set ASSURED if we see valid ack in ESTABLISHED after
+		 * SYN_RECV or a valid answer for a picked up connection.
+		 */
 		set_bit(IPS_ASSURED_BIT, &ct->status);
 		nf_conntrack_event_cache(IPCT_ASSURED, ct);
 	}
-- 
1.8.3.1

Re: [PATCH] netfilter: nf_ct_tcp: Remove the duplicated word in comment

[Pablo Neira Ayuso]

On Sat, Aug 22, 2015 at 11:27:56AM +0800, Feng Gao wrote:
> Hi Pablo,
> 
> To try to resolve the "git am" issue, so I start the new email
> conversation. The attachment is the latest patch file.
> 
> The following is the patch content too.

Still not working, I think your MUA is mangling the patch. I can see
that tabs are converted to spaces.

$ git am /temporary/netfilter-nf_ct_tcp-Remove-the-duplicated-word-in-comment.patch -s
Applying: netfilter: nf_ct_tcp: Remove the duplicated word in comment
error: patch failed: net/netfilter/nf_conntrack_proto_tcp.c:1088
error: net/netfilter/nf_conntrack_proto_tcp.c: patch does not apply
Patch failed at 0001 netfilter: nf_ct_tcp: Remove the duplicated word in comment
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
$ git am --abort
$ patch -p1 < /temporary/netfilter_ct_tcp-Remove-the-duplicated-word-in-comment.patch 
patching file net/netfilter/nf_conntrack_proto_tcp.c
Hunk #1 FAILED at 1088.
1 out of 1 hunk FAILED -- saving rejects to file
net/netfilter/nf_conntrack_proto_tcp.c.rej

> -       /* Set ASSURED if we see see valid ack in ESTABLISHED
> -          after SYN_RECV or a valid answer for a picked up
> -          connection. */
> +       /* Set ASSURED if we see valid ack in ESTABLISHED after
> +        * SYN_RECV or a valid answer for a picked up connection.
> +        */
   ^^^^^^^^
I can see space here instead of tab.

Re: [PATCH] netfilter: nf_ct_tcp: Remove the duplicated word in comment

[Feng Gao]

Hi Pablo,

Could you use the attachment instead of the codes in email ?
I think the attachment should not be mangled.

On Sat, Aug 29, 2015 at 7:14 AM, Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> On Sat, Aug 22, 2015 at 11:27:56AM +0800, Feng Gao wrote:
>> Hi Pablo,
>>
>> To try to resolve the "git am" issue, so I start the new email
>> conversation. The attachment is the latest patch file.
>>
>> The following is the patch content too.
>
> Still not working, I think your MUA is mangling the patch. I can see
> that tabs are converted to spaces.
>
> $ git am /temporary/netfilter-nf_ct_tcp-Remove-the-duplicated-word-in-comment.patch -s
> Applying: netfilter: nf_ct_tcp: Remove the duplicated word in comment
> error: patch failed: net/netfilter/nf_conntrack_proto_tcp.c:1088
> error: net/netfilter/nf_conntrack_proto_tcp.c: patch does not apply
> Patch failed at 0001 netfilter: nf_ct_tcp: Remove the duplicated word in comment
> When you have resolved this problem run "git am --resolved".
> If you would prefer to skip this patch, instead run "git am --skip".
> To restore the original branch and stop patching run "git am --abort".
> $ git am --abort
> $ patch -p1 < /temporary/netfilter_ct_tcp-Remove-the-duplicated-word-in-comment.patch
> patching file net/netfilter/nf_conntrack_proto_tcp.c
> Hunk #1 FAILED at 1088.
> 1 out of 1 hunk FAILED -- saving rejects to file
> net/netfilter/nf_conntrack_proto_tcp.c.rej
>
>> -       /* Set ASSURED if we see see valid ack in ESTABLISHED
>> -          after SYN_RECV or a valid answer for a picked up
>> -          connection. */
>> +       /* Set ASSURED if we see valid ack in ESTABLISHED after
>> +        * SYN_RECV or a valid answer for a picked up connection.
>> +        */
>    ^^^^^^^^
> I can see space here instead of tab.
>