diff for duplicates of <878vdqbofe.fsf_-_@xmission.com> diff --git a/a/1.txt b/N1/1.txt index a1a36c4..84dbf8c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -289,7 +289,8 @@ index 93a4513..b1ef3bc 100644 @@ -175,7 +176,7 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a asoc->timeouts[SCTP_EVENT_TIMEOUT_HEARTBEAT] = 0; asoc->timeouts[SCTP_EVENT_TIMEOUT_SACK] = asoc->sackdelay; - asoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE] - min_t(unsigned long, sp->autoclose, sctp_max_autoclose) * HZ; + asoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE] = +- min_t(unsigned long, sp->autoclose, sctp_max_autoclose) * HZ; + min_t(unsigned long, sp->autoclose, net->sctp.max_autoclose) * HZ; /* Initializes the timers */ @@ -424,7 +425,8 @@ index 8315792..1859e2b 100644 + if (net->sctp.addip_enable) { auth_chunks->chunks[0] = SCTP_CID_ASCONF; auth_chunks->chunks[1] = SCTP_CID_ASCONF_ACK; - auth_chunks->param_hdr.length @@ -140,14 +141,14 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, + auth_chunks->param_hdr.length = +@@ -140,14 +141,14 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, INIT_LIST_HEAD(&ep->asocs); /* Use SCTP specific send buffer space queues. */ @@ -859,13 +861,13 @@ index 4a029d7..84d98d8 100644 - if (sctp_prsctp_enable) { + if (net->sctp.prsctp_enable) { - if (cid = SCTP_CID_FWD_TSN) + if (cid == SCTP_CID_FWD_TSN) return &prsctp_chunk_event_table[0][state]; } - if (sctp_addip_enable) { + if (net->sctp.addip_enable) { - if (cid = SCTP_CID_ASCONF) + if (cid == SCTP_CID_ASCONF) return &addip_chunk_event_table[0][state]; @@ -931,7 +931,7 @@ static const sctp_sm_table_entry_t *sctp_chunk_event_lookup(struct net *net, @@ -874,7 +876,7 @@ index 4a029d7..84d98d8 100644 - if (sctp_auth_enable) { + if (net->sctp.auth_enable) { - if (cid = SCTP_CID_AUTH) + if (cid == SCTP_CID_AUTH) return &auth_chunk_event_table[0][state]; } diff --git a/net/sctp/socket.c b/net/sctp/socket.c diff --git a/a/content_digest b/N1/content_digest index a77fdfc..8961c2b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\087ipcud3ld.fsf_-_@xmission.com\0" "From\0ebiederm@xmission.com (Eric W. Biederman)\0" "Subject\0[PATCH net-next 7/7] sctp: Make sysctl tunables per net\0" - "Date\0Tue, 07 Aug 2012 17:29:57 +0000\0" + "Date\0Tue, 07 Aug 2012 10:29:57 -0700\0" "To\0David Miller <davem@davemloft.net>\0" "Cc\0Vlad Yasevich <vyasevich@gmail.com>" linux-sctp@vger.kernel.org @@ -308,7 +308,8 @@ "@@ -175,7 +176,7 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a\n" " \tasoc->timeouts[SCTP_EVENT_TIMEOUT_HEARTBEAT] = 0;\n" " \tasoc->timeouts[SCTP_EVENT_TIMEOUT_SACK] = asoc->sackdelay;\n" - " \tasoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE] -\t\tmin_t(unsigned long, sp->autoclose, sctp_max_autoclose) * HZ;\n" + " \tasoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE] =\n" + "-\t\tmin_t(unsigned long, sp->autoclose, sctp_max_autoclose) * HZ;\n" "+\t\tmin_t(unsigned long, sp->autoclose, net->sctp.max_autoclose) * HZ;\n" " \n" " \t/* Initializes the timers */\n" @@ -443,7 +444,8 @@ "+\t\tif (net->sctp.addip_enable) {\n" " \t\t\tauth_chunks->chunks[0] = SCTP_CID_ASCONF;\n" " \t\t\tauth_chunks->chunks[1] = SCTP_CID_ASCONF_ACK;\n" - " \t\t\tauth_chunks->param_hdr.length @@ -140,14 +141,14 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,\n" + " \t\t\tauth_chunks->param_hdr.length =\n" + "@@ -140,14 +141,14 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,\n" " \tINIT_LIST_HEAD(&ep->asocs);\n" " \n" " \t/* Use SCTP specific send buffer space queues. */\n" @@ -878,13 +880,13 @@ " \n" "-\tif (sctp_prsctp_enable) {\n" "+\tif (net->sctp.prsctp_enable) {\n" - " \t\tif (cid = SCTP_CID_FWD_TSN)\n" + " \t\tif (cid == SCTP_CID_FWD_TSN)\n" " \t\t\treturn &prsctp_chunk_event_table[0][state];\n" " \t}\n" " \n" "-\tif (sctp_addip_enable) {\n" "+\tif (net->sctp.addip_enable) {\n" - " \t\tif (cid = SCTP_CID_ASCONF)\n" + " \t\tif (cid == SCTP_CID_ASCONF)\n" " \t\t\treturn &addip_chunk_event_table[0][state];\n" " \n" "@@ -931,7 +931,7 @@ static const sctp_sm_table_entry_t *sctp_chunk_event_lookup(struct net *net,\n" @@ -893,7 +895,7 @@ " \n" "-\tif (sctp_auth_enable) {\n" "+\tif (net->sctp.auth_enable) {\n" - " \t\tif (cid = SCTP_CID_AUTH)\n" + " \t\tif (cid == SCTP_CID_AUTH)\n" " \t\t\treturn &auth_chunk_event_table[0][state];\n" " \t}\n" "diff --git a/net/sctp/socket.c b/net/sctp/socket.c\n" @@ -1540,4 +1542,4 @@ "-- \n" 1.7.5.4 -525fc0f23c1688dfda218c58b2f7109d28e3ed46f1c2b9dd8d3fb787d329ba65 +73f13c3051faece3dfe8433170f8eb3a5e2efc029b69002eea5659eeeecc287e
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.