diff for duplicates of <502B1581.7080506@gmail.com> diff --git a/a/1.txt b/N1/1.txt index bed4432..63040dd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -443,7 +443,7 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > @@ -322,7 +324,7 @@ sctp_disposition_t sctp_sf_do_5_1B_init(const struct sctp_endpoint *ep, > */ > net = sock_net(ep->base.sk); -> if (ep = sctp_sk(net->sctp.ctl_sock)->ep) { +> if (ep == sctp_sk(net->sctp.ctl_sock)->ep) { > - SCTP_INC_STATS(SCTP_MIB_OUTOFBLUES); > + SCTP_INC_STATS(net, SCTP_MIB_OUTOFBLUES); > return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands); @@ -479,7 +479,7 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > @@ -656,7 +658,7 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(const struct sctp_endpoint *ep, > */ > net = sock_net(ep->base.sk); -> if (ep = sctp_sk(net->sctp.ctl_sock)->ep) { +> if (ep == sctp_sk(net->sctp.ctl_sock)->ep) { > - SCTP_INC_STATS(SCTP_MIB_OUTOFBLUES); > + SCTP_INC_STATS(net, SCTP_MIB_OUTOFBLUES); > return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands); @@ -692,7 +692,7 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > return SCTP_DISPOSITION_ABORT; > } > -> if ((rcvd_serial = sent_serial) && asoc->addip_last_asconf) { +> if ((rcvd_serial == sent_serial) && asoc->addip_last_asconf) { > + struct net *net; > sctp_add_cmd_sf(commands, SCTP_CMD_TIMER_STOP, > SCTP_TO(SCTP_EVENT_TIMEOUT_T4_RTO)); @@ -841,7 +841,7 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > + SCTP_INC_STATS(net, SCTP_MIB_T3_RTX_EXPIREDS); > > if (asoc->overall_error_count >= asoc->max_retrans) { -> if (asoc->state = SCTP_STATE_SHUTDOWN_PENDING) { +> if (asoc->state == SCTP_STATE_SHUTDOWN_PENDING) { > @@ -5340,8 +5364,8 @@ sctp_disposition_t sctp_sf_do_6_3_3_rtx(const struct sctp_endpoint *ep, > /* CMD_ASSOC_FAILED calls CMD_DELETE_TCB. */ > sctp_add_cmd_sf(commands, SCTP_CMD_ASSOC_FAILED, @@ -989,7 +989,7 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > * DATA chunk if a received DATA chunk has no user data. > */ > + net = sock_net(sk); -> if (unlikely(0 = datalen)) { +> if (unlikely(0 == datalen)) { > err = sctp_make_abort_no_data(asoc, chunk, tsn); > if (err) { > @@ -6126,8 +6159,8 @@ static int sctp_eat_data(const struct sctp_association *asoc, diff --git a/a/content_digest b/N1/content_digest index 47483e2..df67c9b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\087lihroo10.fsf_-_@xmission.com\0" "From\0Vlad Yasevich <vyasevich@gmail.com>\0" "Subject\0Re: [PATCH net-next 9/9] sctp: Make the mib per network namespace\0" - "Date\0Wed, 15 Aug 2012 03:20:33 +0000\0" + "Date\0Tue, 14 Aug 2012 23:20:33 -0400\0" "To\0Eric W. Biederman <ebiederm@xmission.com>\0" "Cc\0David Miller <davem@davemloft.net>" linux-sctp@vger.kernel.org @@ -462,7 +462,7 @@ "> @@ -322,7 +324,7 @@ sctp_disposition_t sctp_sf_do_5_1B_init(const struct sctp_endpoint *ep,\n" "> \t */\n" "> \tnet = sock_net(ep->base.sk);\n" - "> \tif (ep = sctp_sk(net->sctp.ctl_sock)->ep) {\n" + "> \tif (ep == sctp_sk(net->sctp.ctl_sock)->ep) {\n" "> -\t\tSCTP_INC_STATS(SCTP_MIB_OUTOFBLUES);\n" "> +\t\tSCTP_INC_STATS(net, SCTP_MIB_OUTOFBLUES);\n" "> \t\treturn sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);\n" @@ -498,7 +498,7 @@ "> @@ -656,7 +658,7 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(const struct sctp_endpoint *ep,\n" "> \t */\n" "> \tnet = sock_net(ep->base.sk);\n" - "> \tif (ep = sctp_sk(net->sctp.ctl_sock)->ep) {\n" + "> \tif (ep == sctp_sk(net->sctp.ctl_sock)->ep) {\n" "> -\t\tSCTP_INC_STATS(SCTP_MIB_OUTOFBLUES);\n" "> +\t\tSCTP_INC_STATS(net, SCTP_MIB_OUTOFBLUES);\n" "> \t\treturn sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);\n" @@ -711,7 +711,7 @@ "> \t\treturn SCTP_DISPOSITION_ABORT;\n" "> \t}\n" ">\n" - "> \tif ((rcvd_serial = sent_serial) && asoc->addip_last_asconf) {\n" + "> \tif ((rcvd_serial == sent_serial) && asoc->addip_last_asconf) {\n" "> +\t\tstruct net *net;\n" "> \t\tsctp_add_cmd_sf(commands, SCTP_CMD_TIMER_STOP,\n" "> \t\t\t\tSCTP_TO(SCTP_EVENT_TIMEOUT_T4_RTO));\n" @@ -860,7 +860,7 @@ "> +\tSCTP_INC_STATS(net, SCTP_MIB_T3_RTX_EXPIREDS);\n" ">\n" "> \tif (asoc->overall_error_count >= asoc->max_retrans) {\n" - "> \t\tif (asoc->state = SCTP_STATE_SHUTDOWN_PENDING) {\n" + "> \t\tif (asoc->state == SCTP_STATE_SHUTDOWN_PENDING) {\n" "> @@ -5340,8 +5364,8 @@ sctp_disposition_t sctp_sf_do_6_3_3_rtx(const struct sctp_endpoint *ep,\n" "> \t\t\t/* CMD_ASSOC_FAILED calls CMD_DELETE_TCB. */\n" "> \t\t\tsctp_add_cmd_sf(commands, SCTP_CMD_ASSOC_FAILED,\n" @@ -1008,7 +1008,7 @@ "> \t * DATA chunk if a received DATA chunk has no user data.\n" "> \t */\n" "> +\tnet = sock_net(sk);\n" - "> \tif (unlikely(0 = datalen)) {\n" + "> \tif (unlikely(0 == datalen)) {\n" "> \t\terr = sctp_make_abort_no_data(asoc, chunk, tsn);\n" "> \t\tif (err) {\n" "> @@ -6126,8 +6159,8 @@ static int sctp_eat_data(const struct sctp_association *asoc,\n" @@ -1100,4 +1100,4 @@ ">\n" > -6233e8fb9771a57578e0a2695a1d9d6be2f65c3e5e549a09533ae7346439d333 +2ba466c3d4a0273bce5b88dbe200b257ca52f2c3af666513be39fef0928b8545
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.