diff for duplicates of <4BC7CEBC.70200@cn.fujitsu.com> diff --git a/a/content_digest b/N1/content_digest index c5d23bf..e8a0cc8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,20 @@ "From\0Shan Wei <shanwei@cn.fujitsu.com>\0" "Subject\0[net-next-2.6 PATCH 2/3 v2] net: replace ipfragok with skb->local_df\0" "Date\0Fri, 16 Apr 2010 02:43:08 +0000\0" - "To\0dccp@vger.kernel.org\0" + "To\0David Miller <davem@davemloft.net>" + " Herbert Xu <herbert@gondor.apana.org.au>\0" + "Cc\0Shan Wei <shanwei@cn.fujitsu.com>" + yinghai.lu@oracle.com + kuznet@ms2.inr.ac.ru + pekkas@netcore.fi + jmorris@namei.org + yoshfuji@linux-ipv6.org >> YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> + Patrick McHardy <kaber@trash.net> + netdev@vger.kernel.org + dccp@vger.kernel.org + linux-sctp@vger.kernel.org + jchapman@katalix.com + " mostrows@speakeasy.net\0" "\00:1\0" "b\0" "As Herbert Xu said: we should be able to simply replace ipfragok\n" @@ -266,4 +279,4 @@ "-- \n" 1.6.3.3 -5b652cfd13967ca449af85875f80d9cdb968e361236002340b3280cbee4f04fa +b3e75014fe7d9f1fe25fc44b98b3c34e80523666ec19579bd70c86840d4a62ae
diff --git a/a/1.txt b/N2/1.txt index c6a11e4..fa3e80f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -139,7 +139,7 @@ index e468499..2b7d71f 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -890,7 +890,7 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it, - if (after(tcb->end_seq, tp->snd_nxt) || tcb->seq = tcb->end_seq) + if (after(tcb->end_seq, tp->snd_nxt) || tcb->seq == tcb->end_seq) TCP_INC_STATS(sock_net(sk), TCP_MIB_OUTSEGS); - err = icsk->icsk_af_ops->queue_xmit(skb, 0); diff --git a/a/content_digest b/N2/content_digest index c5d23bf..67e7d4b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,20 @@ "From\0Shan Wei <shanwei@cn.fujitsu.com>\0" "Subject\0[net-next-2.6 PATCH 2/3 v2] net: replace ipfragok with skb->local_df\0" - "Date\0Fri, 16 Apr 2010 02:43:08 +0000\0" - "To\0dccp@vger.kernel.org\0" + "Date\0Fri, 16 Apr 2010 10:43:08 +0800\0" + "To\0David Miller <davem@davemloft.net>" + " Herbert Xu <herbert@gondor.apana.org.au>\0" + "Cc\0Shan Wei <shanwei@cn.fujitsu.com>" + yinghai.lu@oracle.com + kuznet@ms2.inr.ac.ru + pekkas@netcore.fi + jmorris@namei.org + yoshfuji@linux-ipv6.org >> YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> + Patrick McHardy <kaber@trash.net> + netdev@vger.kernel.org + dccp@vger.kernel.org + linux-sctp@vger.kernel.org + jchapman@katalix.com + " mostrows@speakeasy.net\0" "\00:1\0" "b\0" "As Herbert Xu said: we should be able to simply replace ipfragok\n" @@ -145,7 +158,7 @@ "--- a/net/ipv4/tcp_output.c\n" "+++ b/net/ipv4/tcp_output.c\n" "@@ -890,7 +890,7 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,\n" - " \tif (after(tcb->end_seq, tp->snd_nxt) || tcb->seq = tcb->end_seq)\n" + " \tif (after(tcb->end_seq, tp->snd_nxt) || tcb->seq == tcb->end_seq)\n" " \t\tTCP_INC_STATS(sock_net(sk), TCP_MIB_OUTSEGS);\n" " \n" "-\terr = icsk->icsk_af_ops->queue_xmit(skb, 0);\n" @@ -266,4 +279,4 @@ "-- \n" 1.6.3.3 -5b652cfd13967ca449af85875f80d9cdb968e361236002340b3280cbee4f04fa +5e5b42c8320b6ecfc9d752f16d91b6709f22c402f15a3059ef7a720290c7e57c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.