diff for duplicates of <20161101173550.GF8514@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index 69adc0f..9ced54d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -148,7 +148,7 @@ Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > - list_for_each_entry(chunk, &packet->chunk_list, list) { > - int padded = SCTP_PAD4(chunk->skb->len); > - -> - if (chunk = packet->auth) +> - if (chunk == packet->auth) > - auth_len = padded; > - else if (auth_len + padded + packet->overhead > > - tp->pathmtu) @@ -174,7 +174,7 @@ Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > - skb_reserve(nskb, packet->overhead + MAX_HEADER); > - } else { > - nskb = head; -> + if (chunk = packet->auth) +> + if (chunk == packet->auth) > + auth_len = padded; > + else if (auth_len + padded + packet->overhead > > + tp->pathmtu) @@ -233,7 +233,7 @@ Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > - * store pointer where it will be added and put > - * the auth into the packet. > - */ -> if (chunk = packet->auth) +> if (chunk == packet->auth) > - auth = skb_tail_pointer(nskb); > + auth = (struct sctp_auth_chunk *) > + skb_tail_pointer(nskb); @@ -305,11 +305,13 @@ Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > + kfree_skb(nskb); > + return 0; > + } -> + if (WARN_ON_ONCE(skb_shinfo(head)->gso_segs >> + sk->sk_gso_max_segs)) +> + if (WARN_ON_ONCE(skb_shinfo(head)->gso_segs >= +> + sk->sk_gso_max_segs)) > + return 0; > } > - nskb = NULL; -> - if (WARN_ON_ONCE(skb_shinfo(head)->gso_segs >> - sk->sk_gso_max_segs)) +> - if (WARN_ON_ONCE(skb_shinfo(head)->gso_segs >= +> - sk->sk_gso_max_segs)) > - goto nomem; > + > + pkt_count++; @@ -369,7 +371,8 @@ Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > - */ > + if (!(skb_dst(head)->dev->features & NETIF_F_SCTP_CRC) || > + dst_xfrm(skb_dst(head)) || packet->ipfragok) { -> + struct sctphdr *sh > + (struct sctphdr *)skb_transport_header(head); +> + struct sctphdr *sh = +> + (struct sctphdr *)skb_transport_header(head); > > - /* Dump that on IP! */ > - if (asoc) { @@ -476,8 +479,10 @@ Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > + /* start autoclose timer */ > + if (packet->has_data && sctp_state(asoc, ESTABLISHED) && > + asoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE]) { -> + struct timer_list *timer > + &asoc->timers[SCTP_EVENT_TIMEOUT_AUTOCLOSE]; -> + unsigned long timeout > + asoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE]; +> + struct timer_list *timer = +> + &asoc->timers[SCTP_EVENT_TIMEOUT_AUTOCLOSE]; +> + unsigned long timeout = +> + asoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE]; > > - skb_shinfo(head)->gso_segs = pktcount; > - skb_shinfo(head)->gso_size = GSO_BY_FRAGS; diff --git a/a/content_digest b/N1/content_digest index ac87536..72f4d8b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0407056b761e77ecbd43603a17099bb9309a9a8ac.1477932581.git.lucien.xin@gmail.com\0" "From\0Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>\0" "Subject\0Re: [PATCH net-next] sctp: clean up sctp_packet_transmit\0" - "Date\0Tue, 01 Nov 2016 17:35:50 +0000\0" + "Date\0Tue, 1 Nov 2016 15:35:50 -0200\0" "To\0Xin Long <lucien.xin@gmail.com>\0" "Cc\0network dev <netdev@vger.kernel.org>" linux-sctp@vger.kernel.org @@ -160,7 +160,7 @@ "> -\t\t\tlist_for_each_entry(chunk, &packet->chunk_list, list) {\n" "> -\t\t\t\tint padded = SCTP_PAD4(chunk->skb->len);\n" "> -\n" - "> -\t\t\t\tif (chunk = packet->auth)\n" + "> -\t\t\t\tif (chunk == packet->auth)\n" "> -\t\t\t\t\tauth_len = padded;\n" "> -\t\t\t\telse if (auth_len + padded + packet->overhead >\n" "> -\t\t\t\t\t tp->pathmtu)\n" @@ -186,7 +186,7 @@ "> -\t\t\tskb_reserve(nskb, packet->overhead + MAX_HEADER);\n" "> -\t\t} else {\n" "> -\t\t\tnskb = head;\n" - "> +\t\t\tif (chunk = packet->auth)\n" + "> +\t\t\tif (chunk == packet->auth)\n" "> +\t\t\t\tauth_len = padded;\n" "> +\t\t\telse if (auth_len + padded + packet->overhead >\n" "> +\t\t\t\t tp->pathmtu)\n" @@ -245,7 +245,7 @@ "> -\t\t\t * store pointer where it will be added and put\n" "> -\t\t\t * the auth into the packet.\n" "> -\t\t\t */\n" - "> \t\t\tif (chunk = packet->auth)\n" + "> \t\t\tif (chunk == packet->auth)\n" "> -\t\t\t\tauth = skb_tail_pointer(nskb);\n" "> +\t\t\t\tauth = (struct sctp_auth_chunk *)\n" "> +\t\t\t\t\t\t\tskb_tail_pointer(nskb);\n" @@ -317,11 +317,13 @@ "> +\t\t\t\tkfree_skb(nskb);\n" "> +\t\t\t\treturn 0;\n" "> +\t\t\t}\n" - "> +\t\t\tif (WARN_ON_ONCE(skb_shinfo(head)->gso_segs >> +\t\t\t\t\t sk->sk_gso_max_segs))\n" + "> +\t\t\tif (WARN_ON_ONCE(skb_shinfo(head)->gso_segs >=\n" + "> +\t\t\t\t\t sk->sk_gso_max_segs))\n" "> +\t\t\t\treturn 0;\n" "> \t\t}\n" "> -\t\tnskb = NULL;\n" - "> -\t\tif (WARN_ON_ONCE(skb_shinfo(head)->gso_segs >> -\t\t\t\t sk->sk_gso_max_segs))\n" + "> -\t\tif (WARN_ON_ONCE(skb_shinfo(head)->gso_segs >=\n" + "> -\t\t\t\t sk->sk_gso_max_segs))\n" "> -\t\t\tgoto nomem;\n" "> +\n" "> +\t\tpkt_count++;\n" @@ -381,7 +383,8 @@ "> -\t */\n" "> +\tif (!(skb_dst(head)->dev->features & NETIF_F_SCTP_CRC) ||\n" "> +\t dst_xfrm(skb_dst(head)) || packet->ipfragok) {\n" - "> +\t\tstruct sctphdr *sh > +\t\t\t(struct sctphdr *)skb_transport_header(head);\n" + "> +\t\tstruct sctphdr *sh =\n" + "> +\t\t\t(struct sctphdr *)skb_transport_header(head);\n" "> \n" "> -\t/* Dump that on IP! */\n" "> -\tif (asoc) {\n" @@ -488,8 +491,10 @@ "> +\t/* start autoclose timer */\n" "> +\tif (packet->has_data && sctp_state(asoc, ESTABLISHED) &&\n" "> +\t asoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE]) {\n" - "> +\t\tstruct timer_list *timer > +\t\t\t&asoc->timers[SCTP_EVENT_TIMEOUT_AUTOCLOSE];\n" - "> +\t\tunsigned long timeout > +\t\t\tasoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE];\n" + "> +\t\tstruct timer_list *timer =\n" + "> +\t\t\t&asoc->timers[SCTP_EVENT_TIMEOUT_AUTOCLOSE];\n" + "> +\t\tunsigned long timeout =\n" + "> +\t\t\tasoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE];\n" "> \n" "> -\t\tskb_shinfo(head)->gso_segs = pktcount;\n" "> -\t\tskb_shinfo(head)->gso_size = GSO_BY_FRAGS;\n" @@ -556,4 +561,4 @@ "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > -99e490dee638d0d391abbb8308abf2482156f3f2b8c5de892ec4c9df5e47565e +b22dd0f6eeebde2b0183f6f04d7f86384cfaadea5532a54d44d128bab88314c3
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.