diff for duplicates of <87lihroo10.fsf_-_@xmission.com> diff --git a/a/1.txt b/N1/1.txt index 5d061f7..b9d4f71 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -440,7 +440,7 @@ index f2daf61..bee5e2c 100644 @@ -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); @@ -476,7 +476,7 @@ index f2daf61..bee5e2c 100644 @@ -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); @@ -689,7 +689,7 @@ index f2daf61..bee5e2c 100644 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)); @@ -838,7 +838,7 @@ index f2daf61..bee5e2c 100644 + 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, @@ -986,7 +986,7 @@ index f2daf61..bee5e2c 100644 * 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 3a5f666..5ebfd0f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\087zk67q31q.fsf_-_@xmission.com\0" "From\0ebiederm@xmission.com (Eric W. Biederman)\0" "Subject\0[PATCH net-next 9/9] sctp: Make the mib per network namespace\0" - "Date\0Mon, 06 Aug 2012 18:47:55 +0000\0" + "Date\0Mon, 06 Aug 2012 11:47:55 -0700\0" "To\0David Miller <davem@davemloft.net>\0" "Cc\0Vlad Yasevich <vyasevich@gmail.com>" linux-sctp@vger.kernel.org @@ -458,7 +458,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" @@ -494,7 +494,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" @@ -707,7 +707,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" @@ -856,7 +856,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" @@ -1004,7 +1004,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" @@ -1097,4 +1097,4 @@ "-- \n" 1.7.5.4 -8f5af5332e922c09abaec44fe791479825bcc56d8afaddcb827863129fb359dd +6ee819493d2cc90d59b6da02a4a6175336574720e59df87040999842bee75eb8
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.