diff for duplicates of <53C04509.70304@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 08c000c..24401b6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -54,7 +54,7 @@ On 07/09/2014 04:29 AM, David Laight wrote: > > - if (sctp_sk(asoc->base.sk)->nodelay) > - /* Nagle disabled */ -> + if (sctp_sk(asoc->base.sk)->tx_delay = SCTP_F_TX_NODELAY) +> + if (sctp_sk(asoc->base.sk)->tx_delay == SCTP_F_TX_NODELAY) > + /* Nagle disabled and MSG_MORE unset */ > return SCTP_XMIT_OK; > @@ -93,8 +93,8 @@ side-effects on the wire. > if (get_user(val, (int __user *)optval)) > return -EFAULT; > -> - sctp_sk(sk)->nodelay = (val = 0) ? 0 : 1; -> + sctp_sk(sk)->tx_delay = val = 0 ? SCTP_F_TX_NAGLE : SCTP_F_TX_NODELAY; +> - sctp_sk(sk)->nodelay = (val == 0) ? 0 : 1; +> + sctp_sk(sk)->tx_delay = val == 0 ? SCTP_F_TX_NAGLE : SCTP_F_TX_NODELAY; > return 0; > } > @@ -111,7 +111,7 @@ side-effects on the wire. > return -EINVAL; > > len = sizeof(int); -> - val = (sctp_sk(sk)->nodelay = 1); +> - val = (sctp_sk(sk)->nodelay == 1); > + val = sctp_sk(sk)->tx_delay & SCTP_F_TX_NAGLE ? 0 : 1; > if (put_user(len, optlen)) > return -EFAULT; diff --git a/a/content_digest b/N1/content_digest index d321e76..4b6374d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0063D6719AE5E284EB5DD2968C1650D6D1726EEB7@AcuExch.aculab.com\0" "From\0Vlad Yasevich <vyasevich@gmail.com>\0" "Subject\0Re: [PATCH net-next v2 3/3] net: sctp: Add partial support for MSG_MORE on SCTP\0" - "Date\0Fri, 11 Jul 2014 20:11:53 +0000\0" + "Date\0Fri, 11 Jul 2014 16:11:53 -0400\0" "To\0David Laight <David.Laight@aculab.com>" 'netdev@vger.kernel.org' <netdev@vger.kernel.org> " 'linux-sctp@vger.kernel.org' <linux-sctp@vger.kernel.org>\0" @@ -64,7 +64,7 @@ "> \n" "> -\tif (sctp_sk(asoc->base.sk)->nodelay)\n" "> -\t\t/* Nagle disabled */\n" - "> +\tif (sctp_sk(asoc->base.sk)->tx_delay = SCTP_F_TX_NODELAY)\n" + "> +\tif (sctp_sk(asoc->base.sk)->tx_delay == SCTP_F_TX_NODELAY)\n" "> +\t\t/* Nagle disabled and MSG_MORE unset */\n" "> \t\treturn SCTP_XMIT_OK;\n" "> \n" @@ -103,8 +103,8 @@ "> \tif (get_user(val, (int __user *)optval))\n" "> \t\treturn -EFAULT;\n" "> \n" - "> -\tsctp_sk(sk)->nodelay = (val = 0) ? 0 : 1;\n" - "> +\tsctp_sk(sk)->tx_delay = val = 0 ? SCTP_F_TX_NAGLE : SCTP_F_TX_NODELAY;\n" + "> -\tsctp_sk(sk)->nodelay = (val == 0) ? 0 : 1;\n" + "> +\tsctp_sk(sk)->tx_delay = val == 0 ? SCTP_F_TX_NAGLE : SCTP_F_TX_NODELAY;\n" "> \treturn 0;\n" "> }\n" "> \n" @@ -121,11 +121,11 @@ "> \t\treturn -EINVAL;\n" "> \n" "> \tlen = sizeof(int);\n" - "> -\tval = (sctp_sk(sk)->nodelay = 1);\n" + "> -\tval = (sctp_sk(sk)->nodelay == 1);\n" "> +\tval = sctp_sk(sk)->tx_delay & SCTP_F_TX_NAGLE ? 0 : 1;\n" "> \tif (put_user(len, optlen))\n" "> \t\treturn -EFAULT;\n" "> \tif (copy_to_user(optval, &val, len))\n" > -0068f6300c29baea0e246cd2e3509e86e691793ecf46d5b583fd490755539dd9 +6c11e2fc7698c0edf0a96f182021c28e4b0b51eb42d57dd93cb84e7d16ea7a46
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.