diff for duplicates of <502B14E9.70701@gmail.com> diff --git a/a/1.txt b/N1/1.txt index b244085..60450cb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -75,8 +75,8 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > head = &sctp_port_hashtable[index]; > sctp_spin_lock(&head->lock); > sctp_for_each_hentry(pp, node, &head->chain) -> - if (pp->port = rover) -> + if ((pp->port = rover) && +> - if (pp->port == rover) +> + if ((pp->port == rover) && > + net_eq(sock_net(sk), pp->net)) > goto next; > break; @@ -89,8 +89,8 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > + head = &sctp_port_hashtable[sctp_phashfn(sock_net(sk), snum)]; > sctp_spin_lock(&head->lock); > sctp_for_each_hentry(pp, node, &head->chain) { -> - if (pp->port = snum) -> + if ((pp->port = snum) && net_eq(pp->net, sock_net(sk))) +> - if (pp->port == snum) +> + if ((pp->port == snum) && net_eq(pp->net, sock_net(sk))) > goto pp_found; > } > } @@ -123,7 +123,8 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > @@ -6142,7 +6144,8 @@ static void sctp_bucket_destroy(struct sctp_bind_bucket *pp) > static inline void __sctp_put_port(struct sock *sk) > { -> struct sctp_bind_hashbucket *head > - &sctp_port_hashtable[sctp_phashfn(inet_sk(sk)->inet_num)]; +> struct sctp_bind_hashbucket *head = +> - &sctp_port_hashtable[sctp_phashfn(inet_sk(sk)->inet_num)]; > + &sctp_port_hashtable[sctp_phashfn(sock_net(sk), > + inet_sk(sk)->inet_num)]; > struct sctp_bind_bucket *pp; diff --git a/a/content_digest b/N1/content_digest index b4c6c9e..1dbb7ac 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\087txwfq2z9.fsf_-_@xmission.com\0" "From\0Vlad Yasevich <vyasevich@gmail.com>\0" "Subject\0Re: [PATCH net-next 1/9] sctp: Make the port hash table use struct net in it's key.\0" - "Date\0Wed, 15 Aug 2012 03:18:01 +0000\0" + "Date\0Tue, 14 Aug 2012 23:18:01 -0400\0" "To\0Eric W. Biederman <ebiederm@xmission.com>\0" "Cc\0David Miller <davem@davemloft.net>" linux-sctp@vger.kernel.org @@ -94,8 +94,8 @@ "> \t\t\thead = &sctp_port_hashtable[index];\n" "> \t\t\tsctp_spin_lock(&head->lock);\n" "> \t\t\tsctp_for_each_hentry(pp, node, &head->chain)\n" - "> -\t\t\t\tif (pp->port = rover)\n" - "> +\t\t\t\tif ((pp->port = rover) &&\n" + "> -\t\t\t\tif (pp->port == rover)\n" + "> +\t\t\t\tif ((pp->port == rover) &&\n" "> +\t\t\t\t net_eq(sock_net(sk), pp->net))\n" "> \t\t\t\t\tgoto next;\n" "> \t\t\tbreak;\n" @@ -108,8 +108,8 @@ "> +\t\thead = &sctp_port_hashtable[sctp_phashfn(sock_net(sk), snum)];\n" "> \t\tsctp_spin_lock(&head->lock);\n" "> \t\tsctp_for_each_hentry(pp, node, &head->chain) {\n" - "> -\t\t\tif (pp->port = snum)\n" - "> +\t\t\tif ((pp->port = snum) && net_eq(pp->net, sock_net(sk)))\n" + "> -\t\t\tif (pp->port == snum)\n" + "> +\t\t\tif ((pp->port == snum) && net_eq(pp->net, sock_net(sk)))\n" "> \t\t\t\tgoto pp_found;\n" "> \t\t}\n" "> \t}\n" @@ -142,7 +142,8 @@ "> @@ -6142,7 +6144,8 @@ static void sctp_bucket_destroy(struct sctp_bind_bucket *pp)\n" "> static inline void __sctp_put_port(struct sock *sk)\n" "> {\n" - "> \tstruct sctp_bind_hashbucket *head > -\t\t&sctp_port_hashtable[sctp_phashfn(inet_sk(sk)->inet_num)];\n" + "> \tstruct sctp_bind_hashbucket *head =\n" + "> -\t\t&sctp_port_hashtable[sctp_phashfn(inet_sk(sk)->inet_num)];\n" "> +\t\t&sctp_port_hashtable[sctp_phashfn(sock_net(sk),\n" "> +\t\t\t\t\t\t inet_sk(sk)->inet_num)];\n" "> \tstruct sctp_bind_bucket *pp;\n" @@ -160,4 +161,4 @@ "> \tpp = sctp_sk(oldsk)->bind_hash;\n" > -827ff60944e15943e31e4117db2a1c39f40eeeadd1aa0cc17cc34f4f17272558 +0774f90fceafb26ffe9baff8d0bf0a07ba3f797d93ddb07c6d30529cc63cfd12
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.