diff for duplicates of <502B1541.2070200@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 993cc4a..62dab52 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -118,7 +118,7 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > + SOCK_SEQPACKET, IPPROTO_SCTP, net); > > /* If IPv6 socket could not be created, try the IPv4 socket */ -> if (err < 0 && family = PF_INET6) +> if (err < 0 && family == PF_INET6) > - err = inet_ctl_sock_create(&sctp_ctl_sock, AF_INET, > + err = inet_ctl_sock_create(&net->sctp.ctl_sock, AF_INET, > SOCK_SEQPACKET, IPPROTO_SCTP, @@ -220,9 +220,9 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > /* If the packet is an OOTB packet which is temporarily on the > * control endpoint, respond with an ABORT. > */ -> - if (ep = sctp_sk((sctp_get_ctl_sock()))->ep) { +> - if (ep == sctp_sk((sctp_get_ctl_sock()))->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); > return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands); > } @@ -235,9 +235,9 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > /* If the packet is an OOTB packet which is temporarily on the > * control endpoint, respond with an ABORT. > */ -> - if (ep = sctp_sk((sctp_get_ctl_sock()))->ep) { +> - if (ep == sctp_sk((sctp_get_ctl_sock()))->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); > return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands); > } @@ -284,8 +284,8 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > /* Per the above section, we'll discard the chunk if we have an > * endpoint. If this is an OOTB INIT-ACK, treat it as such. > */ -> - if (ep = sctp_sk((sctp_get_ctl_sock()))->ep) -> + if (ep = sctp_sk(net->sctp.ctl_sock)->ep) +> - if (ep == sctp_sk((sctp_get_ctl_sock()))->ep) +> + if (ep == sctp_sk(net->sctp.ctl_sock)->ep) > return sctp_sf_ootb(ep, asoc, type, arg, commands); > else > return sctp_sf_discard_chunk(ep, asoc, type, arg, commands); @@ -328,7 +328,7 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > + net = sock_net(ep->base.sk); > if (asoc) { > /* Treat INIT-ACK as a special case during COOKIE-WAIT. */ -> if (chunk->chunk_hdr->type = SCTP_CID_INIT_ACK && +> if (chunk->chunk_hdr->type == SCTP_CID_INIT_ACK && > @@ -4319,7 +4332,7 @@ static sctp_disposition_t sctp_sf_abort_violation( > SCTP_DEC_STATS(SCTP_MIB_CURRESTAB); > } diff --git a/a/content_digest b/N1/content_digest index 69a3f70..319af04 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\0877gtbq2th.fsf_-_@xmission.com\0" "From\0Vlad Yasevich <vyasevich@gmail.com>\0" "Subject\0Re: [PATCH net-next 5/9] sctp: Make the ctl_sock per network namespace\0" - "Date\0Wed, 15 Aug 2012 03:19:29 +0000\0" + "Date\0Tue, 14 Aug 2012 23:19:29 -0400\0" "To\0Eric W. Biederman <ebiederm@xmission.com>\0" "Cc\0David Miller <davem@davemloft.net>" linux-sctp@vger.kernel.org @@ -137,7 +137,7 @@ "> +\t\t\t\t SOCK_SEQPACKET, IPPROTO_SCTP, net);\n" ">\n" "> \t/* If IPv6 socket could not be created, try the IPv4 socket */\n" - "> \tif (err < 0 && family = PF_INET6)\n" + "> \tif (err < 0 && family == PF_INET6)\n" "> -\t\terr = inet_ctl_sock_create(&sctp_ctl_sock, AF_INET,\n" "> +\t\terr = inet_ctl_sock_create(&net->sctp.ctl_sock, AF_INET,\n" "> \t\t\t\t\t SOCK_SEQPACKET, IPPROTO_SCTP,\n" @@ -239,9 +239,9 @@ "> \t/* If the packet is an OOTB packet which is temporarily on the\n" "> \t * control endpoint, respond with an ABORT.\n" "> \t */\n" - "> -\tif (ep = sctp_sk((sctp_get_ctl_sock()))->ep) {\n" + "> -\tif (ep == sctp_sk((sctp_get_ctl_sock()))->ep) {\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\treturn sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);\n" "> \t}\n" @@ -254,9 +254,9 @@ "> \t/* If the packet is an OOTB packet which is temporarily on the\n" "> \t * control endpoint, respond with an ABORT.\n" "> \t */\n" - "> -\tif (ep = sctp_sk((sctp_get_ctl_sock()))->ep) {\n" + "> -\tif (ep == sctp_sk((sctp_get_ctl_sock()))->ep) {\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\treturn sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);\n" "> \t}\n" @@ -303,8 +303,8 @@ "> \t/* Per the above section, we'll discard the chunk if we have an\n" "> \t * endpoint. If this is an OOTB INIT-ACK, treat it as such.\n" "> \t */\n" - "> -\tif (ep = sctp_sk((sctp_get_ctl_sock()))->ep)\n" - "> +\tif (ep = sctp_sk(net->sctp.ctl_sock)->ep)\n" + "> -\tif (ep == sctp_sk((sctp_get_ctl_sock()))->ep)\n" + "> +\tif (ep == sctp_sk(net->sctp.ctl_sock)->ep)\n" "> \t\treturn sctp_sf_ootb(ep, asoc, type, arg, commands);\n" "> \telse\n" "> \t\treturn sctp_sf_discard_chunk(ep, asoc, type, arg, commands);\n" @@ -347,7 +347,7 @@ "> +\tnet = sock_net(ep->base.sk);\n" "> \tif (asoc) {\n" "> \t\t/* Treat INIT-ACK as a special case during COOKIE-WAIT. */\n" - "> \t\tif (chunk->chunk_hdr->type = SCTP_CID_INIT_ACK &&\n" + "> \t\tif (chunk->chunk_hdr->type == SCTP_CID_INIT_ACK &&\n" "> @@ -4319,7 +4332,7 @@ static sctp_disposition_t sctp_sf_abort_violation(\n" "> \t\t\tSCTP_DEC_STATS(SCTP_MIB_CURRESTAB);\n" "> \t\t}\n" @@ -400,4 +400,4 @@ ">\n" > -e572dc3be910f238036b555233a38c9dbb33298d1af3aaf73a30089a02b9d9bf +8c21bee5c1a16ea2bb0a8687174450dba86e79b15a154bf2ec8b2f8ad80462d7
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.