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@xxxxxxxxx> 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@xxxxxxxxx> --- 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:
0001-netfilter-nf_ct_tcp-Remove-the-duplicated-word-in-co.patch
Description: Binary data