diff for duplicates of <87txwfq2z9.fsf_-_@xmission.com> diff --git a/a/1.txt b/N1/1.txt index 9abf2a6..de6ce53 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -70,8 +70,8 @@ index 5e25981..4316b0f 100644 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; @@ -84,8 +84,8 @@ index 5e25981..4316b0f 100644 + 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; } } @@ -118,7 +118,8 @@ index 5e25981..4316b0f 100644 @@ -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 c42b3f4..c0d2866 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\087zk67q31q.fsf_-_@xmission.com\0" "From\0ebiederm@xmission.com (Eric W. Biederman)\0" "Subject\0[PATCH net-next 1/9] sctp: Make the port hash table use struct net in it's key.\0" - "Date\0Mon, 06 Aug 2012 18:39:38 +0000\0" + "Date\0Mon, 06 Aug 2012 11:39:38 -0700\0" "To\0David Miller <davem@davemloft.net>\0" "Cc\0Vlad Yasevich <vyasevich@gmail.com>" linux-sctp@vger.kernel.org @@ -88,8 +88,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" @@ -102,8 +102,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" @@ -136,7 +136,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" @@ -155,4 +156,4 @@ "-- \n" 1.7.5.4 -77dd143dbc01062686425c875758849aa40fe0edb6ca59d2db76a9a537ccdd48 +ea6925d145b337c850ac2c0d8c875bcb15abbe561fc727064be3d72dfdc0d414
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.