diff for duplicates of <20161028195750.GD4193@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index 022d5c3..7acb72f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -91,10 +91,10 @@ Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > @@ -351,7 +353,7 @@ int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb) > done: > /* Release the refs we took in sctp_add_backlog */ -> if (SCTP_EP_TYPE_ASSOCIATION = rcvr->type) +> if (SCTP_EP_TYPE_ASSOCIATION == rcvr->type) > - sctp_association_put(sctp_assoc(rcvr)); > + sctp_transport_put(t); -> else if (SCTP_EP_TYPE_SOCKET = rcvr->type) +> else if (SCTP_EP_TYPE_SOCKET == rcvr->type) > sctp_endpoint_put(sctp_ep(rcvr)); > else > @@ -363,6 +365,7 @@ int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb) @@ -108,10 +108,10 @@ Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > @@ -373,7 +376,7 @@ static int sctp_add_backlog(struct sock *sk, struct sk_buff *skb) > * from us > */ -> if (SCTP_EP_TYPE_ASSOCIATION = rcvr->type) +> if (SCTP_EP_TYPE_ASSOCIATION == rcvr->type) > - sctp_association_hold(sctp_assoc(rcvr)); > + sctp_transport_hold(t); -> else if (SCTP_EP_TYPE_SOCKET = rcvr->type) +> else if (SCTP_EP_TYPE_SOCKET == rcvr->type) > sctp_endpoint_hold(sctp_ep(rcvr)); > else > @@ -537,15 +540,15 @@ struct sock *sctp_err_lookup(struct net *net, int family, struct sk_buff *skb, diff --git a/a/content_digest b/N1/content_digest index f9b92d3..cb2b5d0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\0e97fc745a330a6be78b13e1f499381f9d1647b40.1477649076.git.lucien.xin@gmail.com\0" "From\0Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>\0" "Subject\0Re: [PATCH net 3/3] sctp: hold transport instead of assoc when lookup assoc in rx path\0" - "Date\0Fri, 28 Oct 2016 19:57:50 +0000\0" + "Date\0Fri, 28 Oct 2016 17:57:50 -0200\0" "To\0Xin Long <lucien.xin@gmail.com>\0" "Cc\0network dev <netdev@vger.kernel.org>" linux-sctp@vger.kernel.org @@ -104,10 +104,10 @@ "> @@ -351,7 +353,7 @@ int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb)\n" "> done:\n" "> \t/* Release the refs we took in sctp_add_backlog */\n" - "> \tif (SCTP_EP_TYPE_ASSOCIATION = rcvr->type)\n" + "> \tif (SCTP_EP_TYPE_ASSOCIATION == rcvr->type)\n" "> -\t\tsctp_association_put(sctp_assoc(rcvr));\n" "> +\t\tsctp_transport_put(t);\n" - "> \telse if (SCTP_EP_TYPE_SOCKET = rcvr->type)\n" + "> \telse if (SCTP_EP_TYPE_SOCKET == rcvr->type)\n" "> \t\tsctp_endpoint_put(sctp_ep(rcvr));\n" "> \telse\n" "> @@ -363,6 +365,7 @@ int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb)\n" @@ -121,10 +121,10 @@ "> @@ -373,7 +376,7 @@ static int sctp_add_backlog(struct sock *sk, struct sk_buff *skb)\n" "> \t\t * from us\n" "> \t\t */\n" - "> \t\tif (SCTP_EP_TYPE_ASSOCIATION = rcvr->type)\n" + "> \t\tif (SCTP_EP_TYPE_ASSOCIATION == rcvr->type)\n" "> -\t\t\tsctp_association_hold(sctp_assoc(rcvr));\n" "> +\t\t\tsctp_transport_hold(t);\n" - "> \t\telse if (SCTP_EP_TYPE_SOCKET = rcvr->type)\n" + "> \t\telse if (SCTP_EP_TYPE_SOCKET == rcvr->type)\n" "> \t\t\tsctp_endpoint_hold(sctp_ep(rcvr));\n" "> \t\telse\n" "> @@ -537,15 +540,15 @@ struct sock *sctp_err_lookup(struct net *net, int family, struct sk_buff *skb,\n" @@ -198,4 +198,4 @@ "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > -a822ade42e73da87befdf6d983b7088762826b104d74448ec3d0d76fa6377bf3 +b1bfed70b198f63675b993cea1a99e5b520809dc0eb3b51e368c58822f67eddf
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.